From fc19957642783f8d6f65e9eb24d89efcf9c900eb Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 27 Jul 2013 14:36:03 -0700
Subject: Missed in commit

---
 res/layout/actionbar_spinner.xml      |  13 +++
 res/layout/album_list_item.xml        |  59 +++++++++++++
 res/layout/appwidget4x1.xml           | 106 +++++++++++++++++++++++
 res/layout/appwidget4x2.xml           | 129 ++++++++++++++++++++++++++++
 res/layout/appwidget4x3.xml           | 112 ++++++++++++++++++++++++
 res/layout/appwidget4x4.xml           | 114 ++++++++++++++++++++++++
 res/layout/artist_list_item.xml       |  37 ++++++++
 res/layout/button_bar.xml             |  27 ++++++
 res/layout/chat.xml                   |  46 ++++++++++
 res/layout/chat_item.xml              |  47 ++++++++++
 res/layout/chat_item_reverse.xml      |  50 +++++++++++
 res/layout/create_podcast.xml         |  27 ++++++
 res/layout/download_activity.xml      |   4 +
 res/layout/download_media_buttons.xml |  61 +++++++++++++
 res/layout/download_playlist.xml      |  31 +++++++
 res/layout/download_slider.xml        |  42 +++++++++
 res/layout/equalizer.xml              |  47 ++++++++++
 res/layout/equalizer_bar.xml          |  39 +++++++++
 res/layout/help.xml                   |  42 +++++++++
 res/layout/home.xml                   |  23 +++++
 res/layout/jukebox_volume.xml         |  29 +++++++
 res/layout/lyrics.xml                 |  57 ++++++++++++
 res/layout/main.xml                   |  81 ++++++++++++++++++
 res/layout/main_buttons.xml           | 157 ++++++++++++++++++++++++++++++++++
 res/layout/notification.xml           | 103 ++++++++++++++++++++++
 res/layout/notification_expanded.xml  | 100 ++++++++++++++++++++++
 res/layout/play_video.xml             |  11 +++
 res/layout/playlist_list_item.xml     |  26 ++++++
 res/layout/progress.xml               |  20 +++++
 res/layout/save_playlist.xml          |  26 ++++++
 res/layout/search.xml                 |  22 +++++
 res/layout/search_buttons.xml         |  85 ++++++++++++++++++
 res/layout/select_album.xml           |  31 +++++++
 res/layout/select_album_footer.xml    |  21 +++++
 res/layout/select_album_header.xml    |  72 ++++++++++++++++
 res/layout/select_artist.xml          |  22 +++++
 res/layout/select_artist_header.xml   |  43 ++++++++++
 res/layout/select_genres.xml          |  30 +++++++
 res/layout/select_playlist.xml        |  30 +++++++
 res/layout/select_podcasts.xml        |  29 +++++++
 res/layout/shuffle_dialog.xml         |  80 +++++++++++++++++
 res/layout/song_list_item.xml         |  96 +++++++++++++++++++++
 res/layout/start_timer.xml            |  27 ++++++
 res/layout/sync_dialog.xml            |  12 +++
 res/layout/tab_progress.xml           |  24 ++++++
 res/layout/update_playlist.xml        |  70 +++++++++++++++
 46 files changed, 2360 insertions(+)
 create mode 100644 res/layout/actionbar_spinner.xml
 create mode 100644 res/layout/album_list_item.xml
 create mode 100644 res/layout/appwidget4x1.xml
 create mode 100644 res/layout/appwidget4x2.xml
 create mode 100644 res/layout/appwidget4x3.xml
 create mode 100644 res/layout/appwidget4x4.xml
 create mode 100644 res/layout/artist_list_item.xml
 create mode 100644 res/layout/button_bar.xml
 create mode 100644 res/layout/chat.xml
 create mode 100644 res/layout/chat_item.xml
 create mode 100644 res/layout/chat_item_reverse.xml
 create mode 100644 res/layout/create_podcast.xml
 create mode 100644 res/layout/download_activity.xml
 create mode 100644 res/layout/download_media_buttons.xml
 create mode 100644 res/layout/download_playlist.xml
 create mode 100644 res/layout/download_slider.xml
 create mode 100644 res/layout/equalizer.xml
 create mode 100644 res/layout/equalizer_bar.xml
 create mode 100644 res/layout/help.xml
 create mode 100644 res/layout/home.xml
 create mode 100644 res/layout/jukebox_volume.xml
 create mode 100644 res/layout/lyrics.xml
 create mode 100644 res/layout/main.xml
 create mode 100644 res/layout/main_buttons.xml
 create mode 100644 res/layout/notification.xml
 create mode 100644 res/layout/notification_expanded.xml
 create mode 100644 res/layout/play_video.xml
 create mode 100644 res/layout/playlist_list_item.xml
 create mode 100644 res/layout/progress.xml
 create mode 100644 res/layout/save_playlist.xml
 create mode 100644 res/layout/search.xml
 create mode 100644 res/layout/search_buttons.xml
 create mode 100644 res/layout/select_album.xml
 create mode 100644 res/layout/select_album_footer.xml
 create mode 100644 res/layout/select_album_header.xml
 create mode 100644 res/layout/select_artist.xml
 create mode 100644 res/layout/select_artist_header.xml
 create mode 100644 res/layout/select_genres.xml
 create mode 100644 res/layout/select_playlist.xml
 create mode 100644 res/layout/select_podcasts.xml
 create mode 100644 res/layout/shuffle_dialog.xml
 create mode 100644 res/layout/song_list_item.xml
 create mode 100644 res/layout/start_timer.xml
 create mode 100644 res/layout/sync_dialog.xml
 create mode 100644 res/layout/tab_progress.xml
 create mode 100644 res/layout/update_playlist.xml

(limited to 'res/layout')

diff --git a/res/layout/actionbar_spinner.xml b/res/layout/actionbar_spinner.xml
new file mode 100644
index 00000000..22055901
--- /dev/null
+++ b/res/layout/actionbar_spinner.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="fill_horizontal" >
+    <Spinner 
+        android:id="@+id/spinner"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:prompt="@string/common.appname"
+    />
+</RelativeLayout>
diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml
new file mode 100644
index 00000000..0b84b4f3
--- /dev/null
+++ b/res/layout/album_list_item.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:id="@id/drag_handle"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+    <ImageView
+            android:id="@+id/album_coverart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|center_vertical"
+            android:paddingTop="1dip"
+			android:paddingBottom="1dip"/>
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="left|center_vertical"
+			android:paddingLeft="10dip"
+            android:paddingRight="3dip">
+
+        <TextView
+                android:id="@+id/album_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:singleLine="true"
+                android:ellipsize="marquee"/>
+
+        <TextView
+                android:id="@+id/album_artist"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:singleLine="true"/>
+
+    </LinearLayout>
+	
+	<ImageButton
+			android:id="@+id/album_star"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="right|center_vertical"
+			android:src="@drawable/ic_stat_star"
+			android:background="@android:color/transparent"
+			android:focusable="false"/>
+
+    <ImageView
+		android:id="@+id/album_more"
+		android:src="@drawable/list_item_more"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		android:paddingRight="6dip"
+		android:background="@drawable/menubar_button"/>
+</LinearLayout>
diff --git a/res/layout/appwidget4x1.xml b/res/layout/appwidget4x1.xml
new file mode 100644
index 00000000..5e55aa37
--- /dev/null
+++ b/res/layout/appwidget4x1.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minWidth="250dp"
+    android:minHeight="40dp"
+    android:background="@drawable/appwidget_bg"
+    android:orientation="horizontal" >
+
+    <ImageView
+        android:id="@+id/appwidget_coverart"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_gravity="center_vertical"
+        android:clickable="true"
+        android:focusable="true"
+        android:src="@drawable/appwidget_art_default" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/appwidget_top"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical"
+			android:background="@drawable/media_button">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="20dip"
+                android:minHeight="16sp"
+                android:paddingLeft="4dip"
+                android:paddingRight="4dip"
+                android:paddingTop="4dip"
+                android:singleLine="true"
+                android:gravity="center_horizontal"
+                android:text="Title"
+                android:textColor="@color/appwidget_text"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/artist"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="10dip"
+                android:minHeight="12sp"
+                android:paddingBottom="4dip"
+                android:paddingLeft="4dip"
+                android:paddingRight="4dip"
+                android:singleLine="true"
+                android:gravity="center_horizontal"
+                android:text="Artist"
+                android:textColor="@color/appwidget_text"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="horizontal"
+            android:paddingBottom="4dip"
+            android:paddingTop="4dip"  >
+
+            <ImageButton
+                android:id="@+id/control_previous"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+				android:scaleType="center"
+                android:background="@drawable/media_button"          
+                android:src="@drawable/ic_appwidget_music_previous" />
+
+            <ImageButton
+                android:id="@+id/control_play"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:scaleType="center"              
+                android:src="@drawable/ic_appwidget_music_play"
+				android:background="@drawable/media_button" />
+
+            <ImageButton
+                android:id="@+id/control_next"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:scaleType="center"
+                android:src="@drawable/ic_appwidget_music_next"
+				android:background="@drawable/media_button" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/appwidget4x2.xml b/res/layout/appwidget4x2.xml
new file mode 100644
index 00000000..575ae1c2
--- /dev/null
+++ b/res/layout/appwidget4x2.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:background="@drawable/appwidget_bg"
+    android:orientation="horizontal" >
+
+    <ImageView
+        android:id="@+id/appwidget_coverart"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:layout_gravity="center_vertical"
+        android:clickable="true"
+        android:focusable="true"
+        android:src="@drawable/appwidget_art_default" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/appwidget_top"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical"
+            android:paddingTop="4dip"
+            android:paddingBottom="4dip"
+			android:background="@drawable/media_button">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="20dip"
+                android:minHeight="16sp"
+                android:paddingLeft="4dip"
+                android:paddingRight="4dip"
+                android:paddingTop="4dip"
+				android:paddingBottom="2dip"
+                android:singleLine="true"
+                android:gravity="center_horizontal"
+                android:text="Title"
+                android:textColor="@color/appwidget_text"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/artist"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="10dip"
+                android:minHeight="12sp"
+                android:paddingLeft="4dip"
+                android:paddingRight="4dip"
+				android:paddingBottom="2dip"
+                android:singleLine="true"
+                android:gravity="center_horizontal"
+                android:text="Artist"
+                android:textColor="@color/appwidget_text"
+                android:textSize="12sp" />
+            
+          <TextView
+                android:id="@+id/album"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="10dip"
+                android:minHeight="12sp"
+                android:paddingBottom="2dip"
+                android:paddingLeft="4dip"
+                android:paddingRight="4dip"
+                android:singleLine="true"
+                android:gravity="center_horizontal"
+                android:text="Album"
+                android:textColor="@color/appwidget_text"
+                android:textSize="12sp" />
+          
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="bottom"
+            android:gravity="bottom"
+            android:paddingBottom="4dip"
+            android:paddingTop="4dip" >"
+
+            <ImageButton
+                android:id="@+id/control_previous"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:scaleType="center"
+                android:background="@drawable/media_button"          
+                android:src="@drawable/ic_appwidget_music_previous" />
+
+            <ImageButton
+                android:id="@+id/control_play"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:scaleType="center"              
+                android:src="@drawable/ic_appwidget_music_play"
+				android:background="@drawable/media_button" />
+
+            <ImageButton
+                android:id="@+id/control_next"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:scaleType="center"
+                android:src="@drawable/ic_appwidget_music_next"
+				android:background="@drawable/media_button" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/appwidget4x3.xml b/res/layout/appwidget4x3.xml
new file mode 100644
index 00000000..b4f685bc
--- /dev/null
+++ b/res/layout/appwidget4x3.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@drawable/appwidget_bg"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:id="@+id/appwidget_coverart"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+		android:scaleType="fitCenter"
+		android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+        android:clickable="true"
+        android:focusable="true"
+        android:paddingTop="6dip"
+        android:paddingBottom="6dip"
+        android:src="@drawable/appwidget_art_default" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/appwidget_top"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical"
+            android:paddingBottom="4dip"
+            android:paddingTop="4dip"
+			android:background="@drawable/media_button">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="20dip"
+                android:minHeight="16sp"
+                android:paddingLeft="5dip"
+                android:paddingRight="5dip"
+                android:singleLine="true"
+                android:textColor="@color/appwidget_text"
+                android:textSize="16sp"
+                android:text="Title"
+                android:layout_gravity="center_horizontal"
+            	android:gravity="center"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/artist"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="10dip"
+                android:minHeight="12sp"
+                android:paddingBottom="2dip"
+                android:paddingLeft="5dip"
+                android:singleLine="true"
+                android:text="Artist"
+                android:layout_gravity="center_horizontal"
+            	android:gravity="center"
+                android:textColor="@color/appwidget_text"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:gravity="bottom"
+            android:orientation="horizontal"
+            android:paddingBottom="4dip">
+
+            <ImageButton
+                android:id="@+id/control_previous"
+                android:layout_width="0dip"
+                android:layout_height="56dip"
+                android:layout_weight="1"
+                android:scaleType="center"
+                android:background="@drawable/media_button"          
+                android:src="@drawable/ic_appwidget_music_previous" />
+
+            <ImageButton
+                android:id="@+id/control_play"
+                android:layout_width="0dip"
+                android:layout_height="56dip"
+                android:layout_weight="1"
+                android:scaleType="center"              
+                android:src="@drawable/ic_appwidget_music_play"
+				android:background="@drawable/media_button" />
+
+            <ImageButton
+                android:id="@+id/control_next"
+                android:layout_width="0dip"
+                android:layout_height="56dip"
+                android:layout_weight="1"
+                android:scaleType="center"
+                android:src="@drawable/ic_appwidget_music_next"
+				android:background="@drawable/media_button" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/appwidget4x4.xml b/res/layout/appwidget4x4.xml
new file mode 100644
index 00000000..6e6c12ab
--- /dev/null
+++ b/res/layout/appwidget4x4.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:background="@drawable/appwidget_bg" >
+
+    <ImageView
+        android:id="@+id/appwidget_coverart"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+		android:scaleType="fitCenter"
+		android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+        android:clickable="true"
+        android:focusable="true"
+        android:layout_margin="6dip"
+        android:paddingTop="6dip"
+        android:paddingBottom="6dip"
+        android:src="@drawable/appwidget_art_default" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+       <LinearLayout
+            android:id="@+id/appwidget_top"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical"
+            android:paddingTop="4dip"
+            android:paddingBottom="4dip"
+			android:background="@drawable/media_button">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="20dip"
+                android:minHeight="16sp"
+                android:paddingLeft="5dip"
+                android:paddingRight="5dip"
+                android:singleLine="true"
+                android:textColor="@color/appwidget_text"
+                android:textSize="16sp"
+                android:text="Title"
+                android:layout_gravity="center_horizontal"
+            	android:gravity="center"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/artist"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"
+                android:fadingEdgeLength="10dip"
+                android:minHeight="12sp"
+                android:paddingBottom="2dip"
+                android:paddingLeft="5dip"
+                android:singleLine="true"
+                android:text="Artist"
+                android:layout_gravity="center_horizontal"
+            	android:gravity="center"
+                android:textColor="@color/appwidget_text"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:gravity="bottom"
+            android:orientation="horizontal"
+            android:paddingBottom="4dip"
+            android:paddingTop="4dip" >
+
+            <ImageButton
+                android:id="@+id/control_previous"
+                android:layout_width="0dip"
+                android:layout_height="56dip"
+                android:layout_weight="1"
+                android:scaleType="center"
+                android:background="@drawable/media_button"          
+                android:src="@drawable/ic_appwidget_music_previous" />
+
+            <ImageButton
+                android:id="@+id/control_play"
+                android:layout_width="0dip"
+                android:layout_height="56dip"
+                android:layout_weight="1"
+                android:scaleType="center"              
+                android:src="@drawable/ic_appwidget_music_play"
+				android:background="@drawable/media_button" />
+
+            <ImageButton
+                android:id="@+id/control_next"
+                android:layout_width="0dip"
+                android:layout_height="56dip"
+                android:layout_weight="1"
+                android:scaleType="center"
+                android:src="@drawable/ic_appwidget_music_next"
+				android:background="@drawable/media_button" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/artist_list_item.xml b/res/layout/artist_list_item.xml
new file mode 100644
index 00000000..3684e176
--- /dev/null
+++ b/res/layout/artist_list_item.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:background="@android:color/transparent">
+		
+	<TextView
+		android:id="@+id/artist_name"
+		android:layout_width="0dip"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:gravity="left|center_vertical"
+		android:paddingLeft="6dip"
+		android:paddingRight="6dip"
+		android:minHeight="50dip"
+		android:background="@android:color/transparent"/>
+		
+	<ImageButton
+		android:id="@+id/artist_star"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="right|center_vertical"
+		android:src="@drawable/ic_stat_star"
+		android:background="@android:color/transparent"
+		android:focusable="false"/>
+
+    <ImageView
+		android:id="@+id/artist_more"
+		android:src="@drawable/list_item_more"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		android:paddingRight="6dip"
+		android:background="@drawable/menubar_button"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/button_bar.xml b/res/layout/button_bar.xml
new file mode 100644
index 00000000..8f49c99a
--- /dev/null
+++ b/res/layout/button_bar.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/button_bar"
+              android:layout_gravity="bottom"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              android:background="@android:color/transparent">
+
+    <Button style="@style/MenuBarButton"
+            android:id="@+id/button_bar_home"
+            android:text="@string/button_bar.home"/>
+
+    <Button style="@style/MenuBarButton"
+            android:id="@+id/button_bar_music"
+            android:text="@string/button_bar.browse"/>
+
+    <Button style="@style/MenuBarButton"
+            android:id="@+id/button_bar_playlists"
+            android:text="@string/button_bar.playlists"/>
+
+    <Button style="@style/MenuBarButton"
+            android:id="@+id/button_bar_now_playing"
+            android:text="@string/button_bar.now_playing"/>
+</LinearLayout>
+
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
new file mode 100644
index 00000000..fdeb5b36
--- /dev/null
+++ b/res/layout/chat.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="vertical" >
+
+	<include layout="@layout/tab_progress" />
+
+	<ListView
+		android:id="@+id/chat_entries"
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1.0"
+		android:textFilterEnabled="true" />
+
+	<LinearLayout 
+		android:layout_height="4dip" 
+		android:layout_width="fill_parent" 
+		android:layout_marginTop="4dip"/>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="bottom" >
+
+		<EditText
+			android:id="@+id/chat_edittext"
+			android:layout_width="0dip"
+			android:layout_height="40dip"
+			android:layout_weight="1"
+			android:autoLink="all"
+			android:hint="@string/chat.send_a_message"
+			android:inputType="textEmailAddress|textMultiLine"            
+			android:linksClickable="true"
+			android:paddingBottom="10dip"
+			android:paddingTop="10dip" />
+
+		<ImageButton
+			android:id="@+id/chat_send"
+			android:layout_width="60dip"
+			android:layout_height="40dip"
+			android:src="?attr/chat_send" />
+
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chat_item.xml b/res/layout/chat_item.xml
new file mode 100644
index 00000000..b44631d1
--- /dev/null
+++ b/res/layout/chat_item.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical" >
+
+	<TextView
+		android:id="@+id/chat_username"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="6dip"
+		android:layout_marginRight="6dip"
+		android:ellipsize="marquee"
+		android:singleLine="true"
+		android:text="User"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorSecondary"/>
+
+	<LinearLayout
+		android:id="@+id/chat_message_layout"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="2dip"
+		android:orientation="horizontal" >
+
+		<TextView
+			android:id="@+id/chat_time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="6dip"
+			android:singleLine="true"
+			android:text="00:00"
+			android:textAppearance="?android:attr/textAppearanceMedium" />
+
+		<TextView
+			android:id="@+id/chat_message"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="6dip"
+			android:layout_marginRight="6dip"
+			android:autoLink="all"
+			android:linksClickable="true"
+			android:singleLine="false"
+			android:text="Message Text Goes Here"
+			android:textAppearance="?android:attr/textAppearanceMedium" />
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chat_item_reverse.xml b/res/layout/chat_item_reverse.xml
new file mode 100644
index 00000000..62695521
--- /dev/null
+++ b/res/layout/chat_item_reverse.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical" >
+
+	<TextView
+		android:id="@+id/chat_username"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginRight="6dip"
+		android:gravity="right"
+		android:layout_gravity="right"
+		android:ellipsize="marquee"
+		android:singleLine="true"
+		android:text="User"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorSecondary"/>
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="2dip"
+		android:orientation="horizontal"
+		android:layout_gravity="right" >
+
+		<TextView
+			android:id="@+id/chat_time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="6dip"
+			android:singleLine="true"
+			android:gravity="right"
+			android:text="00:00"
+			android:textAppearance="?android:attr/textAppearanceMedium" />
+
+		<TextView
+			android:id="@+id/chat_message"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="6dip"
+			android:layout_marginRight="6dip"
+			android:autoLink="all"
+			android:linksClickable="true"
+			android:singleLine="false"
+			android:gravity="right"
+			android:text="Chat message"
+			android:textAppearance="?android:attr/textAppearanceMedium" />
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/create_podcast.xml b/res/layout/create_podcast.xml
new file mode 100644
index 00000000..5a2ec970
--- /dev/null
+++ b/res/layout/create_podcast.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/create_podcast_url_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/select_podcasts.add_url"/>
+		<EditText
+			android:id="@+id/create_podcast_url"
+			android:inputType="textUri"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:text="http://"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/download_activity.xml b/res/layout/download_activity.xml
new file mode 100644
index 00000000..3a1aa5e4
--- /dev/null
+++ b/res/layout/download_activity.xml
@@ -0,0 +1,4 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/download_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/download_media_buttons.xml b/res/layout/download_media_buttons.xml
new file mode 100644
index 00000000..1835a373
--- /dev/null
+++ b/res/layout/download_media_buttons.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:background="@android:color/transparent">
+
+    <ImageButton
+            style="@style/PlaybackControl.Small"
+            android:id="@+id/download_repeat"
+            android:src="?attr/media_button_repeat_off"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            />
+
+    <github.daneren2005.dsub.view.AutoRepeatButton
+            style="@style/PlaybackControl"
+            android:id="@+id/download_previous"
+            android:src="?attr/media_button_backward"
+            android:layout_toLeftOf="@+id/download_pause"
+            android:layout_centerVertical="true"
+            />
+
+    <ImageButton
+            style="@style/PlaybackControl"
+            android:id="@+id/download_pause"
+            android:src="?attr/media_button_pause"
+            android:layout_centerInParent="true"
+            />
+
+    <ImageButton
+            style="@style/PlaybackControl"
+            android:id="@+id/download_stop"
+            android:src="?attr/media_button_stop"
+            android:layout_centerInParent="true"
+            />
+
+    <ImageButton
+            style="@style/PlaybackControl"
+            android:id="@+id/download_start"
+            android:src="?attr/media_button_start"
+            android:layout_centerInParent="true"
+            />
+
+    <github.daneren2005.dsub.view.AutoRepeatButton
+            style="@style/PlaybackControl"
+            android:id="@+id/download_next"
+            android:src="?attr/media_button_forward"
+            android:layout_toRightOf="@+id/download_start"
+            android:layout_centerVertical="true"
+            />
+
+    <ImageButton
+            style="@style/PlaybackControl.Small"
+			android:id="@+id/download_toggle_list"
+			android:src="@drawable/action_toggle_list"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            />
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/download_playlist.xml b/res/layout/download_playlist.xml
new file mode 100644
index 00000000..e37981e2
--- /dev/null
+++ b/res/layout/download_playlist.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="1">
+			
+	<View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+    <TextView
+            android:id="@+id/download_empty"
+            android:text="@string/download.empty"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dip"/>
+
+    <com.mobeta.android.dslv.DragSortListView
+		style="@style/DragDropListView"
+		android:id="@+id/download_list"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_weight="1"
+		android:cacheColorHint="#00000000"
+		android:fastScrollEnabled="true"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/download_slider.xml b/res/layout/download_slider.xml
new file mode 100644
index 00000000..d4998eea
--- /dev/null
+++ b/res/layout/download_slider.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:background="@android:color/transparent"
+		android:paddingBottom="10dip">
+			
+	<TextView
+            android:id="@+id/download_position"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:paddingLeft="8dip"
+            android:text="0:00"
+            android:textSize="12sp"
+			android:textColor="?android:textColorPrimary"
+			android:paddingBottom="4dip"/>
+
+    <SeekBar
+            android:id="@+id/download_progress_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:indeterminate="false"
+            android:paddingLeft="55dip"
+            android:paddingRight="55dip"
+            android:paddingTop="3dip"
+            android:paddingBottom="7dip" />
+			
+	<TextView
+            android:id="@+id/download_duration"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:paddingRight="8dip"
+            android:text="-:--"
+            android:textSize="12sp"
+			android:textColor="?android:textColorPrimary"
+			android:paddingBottom="4dip"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/equalizer.xml b/res/layout/equalizer.xml
new file mode 100644
index 00000000..ee1a9560
--- /dev/null
+++ b/res/layout/equalizer.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@drawable/album_art_background"
+        android:padding="16dip">
+
+    <CheckBox
+            android:id="@+id/equalizer_enabled"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/equalizer.enabled"
+            android:textColor="#c0c0c0"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+            <LinearLayout
+                    android:id="@+id/equalizer_layout"
+                    android:orientation="vertical"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            <Button
+                    android:id="@+id/equalizer_preset"
+                    android:text="@string/equalizer.preset"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="20dip"
+                    android:paddingLeft="40dip"
+                    android:paddingRight="40dip"/>
+
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
+
diff --git a/res/layout/equalizer_bar.xml b/res/layout/equalizer_bar.xml
new file mode 100644
index 00000000..c34d1108
--- /dev/null
+++ b/res/layout/equalizer_bar.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <TextView
+            android:id="@+id/equalizer.frequency"
+            android:textSize="12sp"
+            android:textColor="#c0c0c0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_alignParentLeft="true"
+            />
+
+    <TextView
+            android:id="@+id/equalizer.level"
+            android:text="0 dB"
+            android:textSize="12sp"
+            android:textColor="#c0c0c0"
+            android:gravity="right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@+id/equalizer.frequency"
+            />
+
+    <SeekBar
+            android:id="@+id/equalizer.bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/equalizer.frequency"
+            />
+
+
+</RelativeLayout>
+
diff --git a/res/layout/help.xml b/res/layout/help.xml
new file mode 100644
index 00000000..f22dee37
--- /dev/null
+++ b/res/layout/help.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+    <LinearLayout android:id="@+id/help_buttons"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="0"
+                  android:layout_alignParentBottom="true"
+                  android:padding="4dip"
+                  android:gravity="center_horizontal"
+                  android:background="#ffcccccc">
+
+        <Button android:id="@+id/help_back"
+                android:text="@string/help.back"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_marginRight="5dip"
+                android:paddingLeft="25dip"
+                android:paddingRight="25dip"/>
+
+        <Button android:id="@+id/help_close"
+                android:text="@string/help.close"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_marginLeft="5dip"
+                android:paddingLeft="25dip"
+                android:paddingRight="25dip"/>
+    </LinearLayout>
+
+
+    <WebView
+            android:id="@+id/help_contents"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/help_buttons"
+            android:layout_weight="1"
+            android:fadingEdge="vertical"
+            android:fadingEdgeLength="12dip"/>
+
+  </RelativeLayout>
diff --git a/res/layout/home.xml b/res/layout/home.xml
new file mode 100644
index 00000000..018061fa
--- /dev/null
+++ b/res/layout/home.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/home_layout"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1px"
+		android:background="@color/dividerColor"/>
+
+	<ListView
+		android:id="@+id/main_list"
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:layout_weight="1"/>
+
+	<View android:id="@+id/main_dummy"
+		android:layout_width="0px"
+		android:layout_height="0px"/>
+</LinearLayout>
+
diff --git a/res/layout/jukebox_volume.xml b/res/layout/jukebox_volume.xml
new file mode 100644
index 00000000..e124734b
--- /dev/null
+++ b/res/layout/jukebox_volume.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/toast_layout_root"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:background="@drawable/toast_frame">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/download.jukebox_volume"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="#ffffffff"
+            android:shadowColor="#bb000000"
+            android:shadowRadius="2.75"
+            android:paddingLeft="32dp"
+            android:paddingRight="32dp"
+            android:paddingBottom="12dp"
+            />
+
+    <ProgressBar android:id="@+id/jukebox_volume_progress_bar"
+                 style="@android:style/Widget.ProgressBar.Horizontal"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:paddingBottom="3dp"
+            />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/lyrics.xml b/res/layout/lyrics.xml
new file mode 100644
index 00000000..4307d8dd
--- /dev/null
+++ b/res/layout/lyrics.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <include layout="@layout/tab_progress"/>
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1.0">
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+            <TextView
+                    android:id="@+id/lyrics_artist"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dip"
+                    android:paddingRight="10dip"
+                    android:paddingTop="10dip"
+                    android:paddingBottom="4dip"
+                    />
+
+            <TextView
+                    android:id="@+id/lyrics_title"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dip"
+                    android:paddingRight="10dip"
+                    />
+
+            <TextView
+                    android:id="@+id/lyrics_text"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:gravity="center_horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dip"
+                    android:paddingRight="10dip"
+                    />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <include layout="@layout/button_bar"/>
+
+</LinearLayout>
+
diff --git a/res/layout/main.xml b/res/layout/main.xml
new file mode 100644
index 00000000..f1509db6
--- /dev/null
+++ b/res/layout/main.xml
@@ -0,0 +1,81 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:gravity="center_horizontal"
+	android:orientation="vertical" >
+
+	<android.support.v4.view.ViewPager
+		android:id="@+id/pager"
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:layout_weight="1" >
+	</android.support.v4.view.ViewPager>
+
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1px"
+		android:background="@color/dividerColor"/>
+
+	<LinearLayout
+		android:id="@+id/bottom_bar"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="@drawable/media_button"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:id="@+id/album_art"
+			android:layout_width="50dip"
+			android:layout_height="50dip"
+			android:layout_gravity="left|center"
+			android:scaleType="fitStart"
+			android:src="@drawable/unknown_album"/>
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:orientation="vertical"
+			android:paddingLeft="8dip">
+
+			<TextView
+				android:id="@+id/track_name"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:textColor="?android:textColorPrimary"
+				android:singleLine="true"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:textSize="13sp"
+				android:text="@string/search.artists"/>
+
+			<TextView
+				android:id="@+id/artist_name"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:textColor="?android:textColorSecondary"
+				android:singleLine="true"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:textSize="12sp"
+				android:text="@string/search.albums"/>
+		</LinearLayout>
+
+		<ImageButton
+			style="@style/PlaybackControl.Small"
+			android:id="@+id/download_previous"
+			android:src="?attr/media_button_backward"
+			android:layout_centerVertical="true"/>
+
+		<ImageButton
+			style="@style/PlaybackControl.Small"
+			android:id="@+id/download_start"
+			android:src="?attr/media_button_start"
+			android:layout_centerVertical="true"/>
+
+		<ImageButton
+			style="@style/PlaybackControl.Small"
+			android:id="@+id/download_next"
+			android:src="?attr/media_button_forward"
+			android:layout_centerVertical="true"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/main_buttons.xml b/res/layout/main_buttons.xml
new file mode 100644
index 00000000..1e60838d
--- /dev/null
+++ b/res/layout/main_buttons.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:id="@+id/main_select_server"
+            android:orientation="horizontal"
+            android:paddingTop="2dip"
+            android:paddingBottom="2dip"
+            android:paddingLeft="6dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight">
+
+        <ImageView
+                android:src="@drawable/main_select_server"
+                android:layout_gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+            <TextView android:id="@+id/main.select_server_1"
+                      android:text="@string/main.select_server"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="10dip"
+                      android:layout_marginTop="6dip"
+                      android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+            <TextView android:id="@+id/main.select_server_2"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="10dip"
+                      android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+        </LinearLayout>
+    </LinearLayout>
+	
+	<TextView
+		android:id="@+id/main_offline"
+		android:text="@string/main.offline"
+		android:drawablePadding="12dip"
+		android:drawableLeft="?attr/offline_icon"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+		android:paddingBottom="4dp"
+		android:minHeight="50dip"/>
+
+    <TextView
+            android:id="@+id/main_albums"
+            android:text="@string/main.albums_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@color/cyan"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dp"
+			android:textAllCaps="true"
+			android:textStyle="bold"
+			android:textSize="16sp"/>
+
+    <TextView
+            android:id="@+id/main_albums_newest"
+            android:text="@string/main.albums_newest"
+            android:drawableRight="@drawable/list_item_more"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_recent"
+            android:text="@string/main.albums_recent"
+            android:drawableRight="@drawable/list_item_more"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_frequent"
+            android:text="@string/main.albums_frequent"
+            android:drawableRight="@drawable/list_item_more"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_highest"
+            android:text="@string/main.albums_highest"
+            android:drawableRight="@drawable/list_item_more"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_starred"
+            android:text="@string/main.albums_starred"
+            android:drawableRight="@drawable/list_item_more"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+	<TextView
+            android:id="@+id/main_albums_genres"
+            android:text="@string/main.albums_genres"
+            android:drawableRight="@drawable/list_item_more"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_random"
+            android:text="@string/main.albums_random"
+            android:drawableRight="@drawable/list_item_more"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+
+</LinearLayout>
+
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
new file mode 100644
index 00000000..22e2cb63
--- /dev/null
+++ b/res/layout/notification.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/statusbar"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal" >
+		
+	<ImageView
+		android:id="@+id/notification_image"
+		android:layout_width="64.0dip"
+		android:layout_height="64.0dip"
+		android:layout_weight="0.0"
+		android:gravity="center" />
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+		android:paddingLeft="11.0dip">
+			
+		<TextView
+			android:id="@+id/notification_title"
+			style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="left"
+			android:ellipsize="marquee"
+			android:focusable="true"
+			android:singleLine="true" />
+			
+		<LinearLayout
+			xmlns:android="http://schemas.android.com/apk/res/android"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:orientation="horizontal" >
+
+			<LinearLayout
+				android:layout_width="0.0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_weight="1.0"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/notification_artist"
+					style="@android:style/TextAppearance.StatusBar.EventContent"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="left"
+					android:ellipsize="end"
+					android:scrollHorizontally="true"
+					android:singleLine="true" />
+
+				<TextView
+					android:id="@+id/notification_album"
+					style="@android:style/TextAppearance.StatusBar.EventContent"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="left"
+					android:ellipsize="end"
+					android:scrollHorizontally="true"
+					android:singleLine="true" />
+			</LinearLayout>
+
+			<ImageButton
+				android:id="@+id/control_previous"
+				android:src="@drawable/notification_prev"
+				android:background="@drawable/btn_bg"
+				android:layout_width="34dip"
+				android:layout_height="34dip"
+				android:layout_gravity="center|right"
+				android:layout_marginRight="10dip"
+				android:layout_marginTop="2dip"
+				android:layout_weight="0.0"
+				android:scaleType="fitXY"/>
+
+			<ImageButton
+				android:id="@+id/control_pause"
+				android:src="@drawable/notification_pause"
+				android:background="@drawable/btn_bg"
+				android:layout_width="34dip"
+				android:layout_height="34dip"
+				android:layout_gravity="center|right"
+				android:layout_marginRight="10dip"
+				android:layout_marginTop="2dip"
+				android:layout_weight="0.0"
+				android:scaleType="fitXY"/>
+
+			<ImageButton
+				android:id="@+id/control_next"
+				android:src="@drawable/notification_next"
+				android:background="@drawable/btn_bg"
+				android:layout_width="34dip"
+				android:layout_height="34dip"
+				android:layout_gravity="center|right"
+				android:layout_marginRight="10dip"
+				android:layout_marginTop="2dip"
+				android:layout_weight="0.0"
+				android:scaleType="fitXY"/>
+		</LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/notification_expanded.xml b/res/layout/notification_expanded.xml
new file mode 100644
index 00000000..70e7269c
--- /dev/null
+++ b/res/layout/notification_expanded.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/statusbar"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal" >
+		
+	<ImageView
+	    android:id="@+id/notification_image"
+	    android:layout_width="128dp"
+	    android:layout_height="128dp"
+	    android:gravity="center" />
+
+	<LinearLayout
+	    xmlns:android="http://schemas.android.com/apk/res/android"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="0.0"
+	    android:orientation="vertical"
+	    android:paddingLeft="11.0dip" >
+
+	    <TextView
+	        android:id="@+id/notification_title"
+	        style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_gravity="left"
+	        android:ellipsize="marquee"
+	        android:focusable="true"
+	        android:singleLine="true" />
+
+	    <TextView
+	        android:id="@+id/notification_artist"
+	        style="@android:style/TextAppearance.StatusBar.EventContent"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_gravity="left"
+	        android:ellipsize="end"
+	        android:scrollHorizontally="true"
+	        android:singleLine="true" />
+
+	    <TextView
+	        android:id="@+id/notification_album"
+	        style="@android:style/TextAppearance.StatusBar.EventContent"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_gravity="left"
+	        android:ellipsize="end"
+	        android:scrollHorizontally="true"
+	        android:singleLine="true" />
+
+	    <TextView
+	        android:id="@+id/textView1"
+	        android:layout_width="wrap_content"
+	        android:layout_height="fill_parent" />
+	    
+	    <LinearLayout
+	        xmlns:android="http://schemas.android.com/apk/res/android"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_gravity="center|fill"
+	        android:gravity="center_horizontal"
+	        android:orientation="horizontal" >
+
+	        <ImageButton
+	            android:id="@+id/control_previous"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_gravity="center"
+	            android:layout_weight="0.0"
+	            android:background="@drawable/btn_bg"
+	            android:scaleType="fitXY"
+	            android:src="@drawable/notification_prev" />
+
+	        <ImageButton
+	            android:id="@+id/control_pause"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_gravity="center"
+	            android:layout_marginLeft="10dp"
+	            android:layout_marginRight="10dp"
+	            android:layout_weight="0.0"
+	            android:background="@drawable/btn_bg"
+	            android:scaleType="fitXY"
+	            android:src="@drawable/notification_pause" />
+
+	        <ImageButton
+	            android:id="@+id/control_next"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_gravity="center"
+	            android:layout_weight="0.0"
+	            android:background="@drawable/btn_bg"
+	            android:scaleType="fitXY"
+	            android:src="@drawable/notification_next" />
+	    </LinearLayout>
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/play_video.xml b/res/layout/play_video.xml
new file mode 100644
index 00000000..6a9f3f74
--- /dev/null
+++ b/res/layout/play_video.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+    <WebView
+            android:id="@+id/play_video_contents"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+
+</FrameLayout>
diff --git a/res/layout/playlist_list_item.xml b/res/layout/playlist_list_item.xml
new file mode 100644
index 00000000..1ec5753f
--- /dev/null
+++ b/res/layout/playlist_list_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content">
+		
+	<TextView
+		android:id="@+id/playlist_name"
+		android:layout_width="0dip"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:gravity="left|center_vertical"
+		android:paddingLeft="6dip"
+		android:paddingRight="6dip"
+		android:minHeight="50dip"/>
+
+    <ImageView
+		android:id="@+id/playlist_more"
+		android:src="@drawable/list_item_more"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		android:paddingRight="6dip"
+		android:background="@drawable/menubar_button"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/progress.xml b/res/layout/progress.xml
new file mode 100644
index 00000000..4a693cb3
--- /dev/null
+++ b/res/layout/progress.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_weight="1"
+              android:layout_width="0dip"
+              android:layout_height="fill_parent"
+              android:padding="10dp">
+
+    <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_marginRight="10dp"/>
+
+    <TextView
+            android:id="@+id/progress_message"
+            android:text="@string/progress.wait"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/save_playlist.xml b/res/layout/save_playlist.xml
new file mode 100644
index 00000000..43f1827a
--- /dev/null
+++ b/res/layout/save_playlist.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/save_playlist_root"
+              android:padding="10dip"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <EditText
+            android:id="@+id/save_playlist_name"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:singleLine="true"/>
+
+	<CheckBox
+			android:id="@+id/save_playlist_overwrite"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/playlist.overwrite"
+			android:layout_marginLeft="4dp"
+			android:checked="false"
+			android:visibility="gone"/>
+
+</LinearLayout>
+
diff --git a/res/layout/search.xml b/res/layout/search.xml
new file mode 100644
index 00000000..d1c5c84c
--- /dev/null
+++ b/res/layout/search.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/search_layout"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+    <include layout="@layout/tab_progress"/>
+
+    <ListView
+            android:id="@+id/search_list"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1.0"
+            android:fastScrollEnabled="true"
+            />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_buttons.xml b/res/layout/search_buttons.xml
new file mode 100644
index 00000000..10b72166
--- /dev/null
+++ b/res/layout/search_buttons.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <TextView
+            android:id="@+id/search_search"
+            android:text="@string/search.search"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="0dp"
+            android:drawableLeft="@drawable/search"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center"
+            android:padding="12dp"/>
+
+    <TextView
+            android:id="@+id/search_artists"
+            android:text="@string/search.artists"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#EFEFEF"
+            android:textStyle="bold"
+            android:background="#A5A5A5"
+            android:gravity="center_vertical"
+            android:paddingLeft="4dp"/>
+
+    <TextView
+            android:id="@+id/search_albums"
+            android:text="@string/search.albums"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#EFEFEF"
+            android:textStyle="bold"
+            android:background="#A5A5A5"
+            android:gravity="center_vertical"
+            android:paddingLeft="4dp"/>
+
+    <TextView
+            android:id="@+id/search_songs"
+            android:text="@string/search.songs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#EFEFEF"
+            android:textStyle="bold"
+            android:background="#A5A5A5"
+            android:gravity="center_vertical"
+            android:paddingLeft="4dp"/>
+
+    <TextView
+            android:id="@+id/search_more_artists"
+            android:text="@string/search.more"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"/>
+
+    <TextView
+            android:id="@+id/search_more_albums"
+            android:text="@string/search.more"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"/>
+
+    <TextView
+            android:id="@+id/search_more_songs"
+            android:text="@string/search.more"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"/>
+
+</LinearLayout>
+
diff --git a/res/layout/select_album.xml b/res/layout/select_album.xml
new file mode 100644
index 00000000..01df495a
--- /dev/null
+++ b/res/layout/select_album.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/select_album_layout"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1px"
+		android:background="@color/dividerColor"/>
+
+	<include layout="@layout/tab_progress"/>
+
+	<TextView
+		android:id="@+id/select_album_empty"
+		android:text="@string/select_album.empty"
+		android:visibility="gone"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dip"/>
+
+	<com.mobeta.android.dslv.DragSortListView
+		style="@style/DragDropListView"
+		android:id="@+id/select_album_entries"
+		android:textFilterEnabled="true"
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1.0"
+		android:fastScrollEnabled="true"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/select_album_footer.xml b/res/layout/select_album_footer.xml
new file mode 100644
index 00000000..c1a30a1a
--- /dev/null
+++ b/res/layout/select_album_footer.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:background="@android:color/transparent"
+              android:paddingTop="6dp"
+              android:paddingBottom="0dp"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+        <Button android:id="@+id/select_album_more"
+                android:text="@string/select_album.more"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:visibility="gone"
+                android:layout_marginLeft="6dp"
+                android:layout_marginRight="6dp"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"/>
+
+</LinearLayout>
+
diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml
new file mode 100644
index 00000000..2bf74110
--- /dev/null
+++ b/res/layout/select_album_header.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/select_album_header"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content">
+		
+	<ImageView
+		android:id="@+id/select_album_art"
+		android:src="@drawable/unknown_album_large"
+		android:layout_width="120dip"
+		android:layout_height="120dip"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true"
+		android:layout_marginRight="10dip"
+		android:scaleType="fitCenter"
+		android:contentDescription="@null"/>
+
+	<TextView
+		android:text="This is the album title"
+		android:id="@+id/select_album_title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_toRightOf="@+id/select_album_art"
+		android:paddingTop="20dip"
+		android:paddingBottom="8dip"
+		android:paddingRight="4dip"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textStyle="bold"
+		android:singleLine="true"
+		android:ellipsize="end"/>
+
+	<TextView
+		android:text="This is the artist name"
+		android:id="@+id/select_album_artist"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/select_album_title"
+		android:layout_toRightOf="@+id/select_album_art"
+		android:paddingBottom="2dip"
+		android:paddingRight="4dip"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:singleLine="true"
+		android:ellipsize="end"/>
+
+	<TextView
+		android:text="XX SONGS"
+		android:id="@+id/select_album_song_count"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/select_album_artist"
+		android:layout_toRightOf="@+id/select_album_art"
+		android:paddingRight="4dip"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="10sp"
+		android:singleLine="true"
+		android:ellipsize="none"/>
+
+	<TextView
+		android:text="0:00"
+		android:id="@+id/select_album_song_length"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/select_album_song_count"
+		android:layout_toRightOf="@+id/select_album_art"
+		android:paddingRight="4dip"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="10sp"
+		android:singleLine="true"
+		android:ellipsize="none"/>
+</RelativeLayout>
+
+
diff --git a/res/layout/select_artist.xml b/res/layout/select_artist.xml
new file mode 100644
index 00000000..fef51d3c
--- /dev/null
+++ b/res/layout/select_artist.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/select_artist_layout"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1px"
+		android:background="@color/dividerColor"/>
+
+	<include layout="@layout/tab_progress"/>
+
+	<ListView android:id="@+id/select_artist_list"
+		android:textFilterEnabled="true"
+		android:fastScrollEnabled="true"
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1.0"/>
+</LinearLayout>
+
diff --git a/res/layout/select_artist_header.xml b/res/layout/select_artist_header.xml
new file mode 100644
index 00000000..0b3d151b
--- /dev/null
+++ b/res/layout/select_artist_header.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content">
+	<LinearLayout
+			android:id="@+id/select_artist_folder"
+			android:orientation="horizontal"
+			android:paddingTop="2dip"
+			android:paddingBottom="2dip"
+			android:paddingLeft="6dp"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:minHeight="?android:attr/listPreferredItemHeight">
+
+		<ImageView
+				android:src="@drawable/main_select_server"
+				android:layout_gravity="center_vertical"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+		<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content">
+
+			<TextView android:id="@+id/select_artist_folder_1"
+					  android:text="@string/select_artist.folder"
+					  android:layout_width="fill_parent"
+					  android:layout_height="wrap_content"
+					  android:layout_marginLeft="10dip"
+					  android:layout_marginTop="6dip"
+					  android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+			<TextView android:id="@+id/select_artist_folder_2"
+					  android:layout_width="fill_parent"
+					  android:layout_height="wrap_content"
+					  android:layout_marginLeft="10dip"
+					  android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/select_genres.xml b/res/layout/select_genres.xml
new file mode 100644
index 00000000..95f9d415
--- /dev/null
+++ b/res/layout/select_genres.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/select_genre_layout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="vertical" >
+
+		<include layout="@layout/tab_progress" />
+
+		<TextView
+			android:id="@+id/select_genre_empty"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:padding="10dip"
+			android:text="@string/select_genre.empty"
+			android:visibility="gone" />
+
+		<ListView
+			android:id="@+id/select_genre_list"
+			android:layout_width="fill_parent"
+			android:layout_height="0dip"
+			android:layout_weight="1.0"
+			android:textFilterEnabled="true"
+			android:fastScrollEnabled="true"/>
+	</LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/select_playlist.xml b/res/layout/select_playlist.xml
new file mode 100644
index 00000000..e18283bd
--- /dev/null
+++ b/res/layout/select_playlist.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/select_playlist_layout"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1px"
+		android:background="@color/dividerColor"/>
+
+	<include layout="@layout/tab_progress"/>
+
+	<TextView
+		android:id="@+id/select_playlist_empty"
+		android:text="@string/select_playlist.empty"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dip"
+		android:visibility="gone"/>
+
+	<ListView android:id="@+id/select_playlist_list"
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1.0"
+		android:fastScrollEnabled="true"/>
+
+</LinearLayout>
+
diff --git a/res/layout/select_podcasts.xml b/res/layout/select_podcasts.xml
new file mode 100644
index 00000000..ea4fb07c
--- /dev/null
+++ b/res/layout/select_podcasts.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/select_podcasts_layout"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="vertical" >
+
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1px"
+		android:background="@color/dividerColor"/>
+
+	<include layout="@layout/tab_progress" />
+
+	<TextView
+		android:id="@+id/select_podcasts_empty"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dip"
+		android:text="@string/select_podcasts.empty"
+		android:visibility="gone" />
+
+	<ListView
+		android:id="@+id/select_podcasts_list"
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1.0"
+		android:fastScrollEnabled="true"/>
+</LinearLayout>
diff --git a/res/layout/shuffle_dialog.xml b/res/layout/shuffle_dialog.xml
new file mode 100644
index 00000000..295f57cb
--- /dev/null
+++ b/res/layout/shuffle_dialog.xml
@@ -0,0 +1,80 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/start_year_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/shuffle.startYear" />
+		<EditText
+			android:id="@+id/start_year"
+			android:inputType="number"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:hint="@string/shuffle.startYear" />
+	</LinearLayout>
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+			
+		<TextView
+			android:id="@+id/end_year_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/shuffle.endYear" />
+		<EditText
+			android:id="@+id/end_year"
+			android:inputType="number"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:hint="@string/shuffle.endYear" />
+	</LinearLayout>
+		
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+		
+		<TextView
+			android:id="@+id/genre_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/shuffle.genre" />
+		<EditText
+			android:id="@+id/genre"
+			android:inputType="text"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:hint="@string/shuffle.genre"/>
+
+		<Button
+			android:id="@+id/genre_combo"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:text="@string/shuffle.genre"
+			style="?android:attr/spinnerStyle"/>
+	</LinearLayout>
+</LinearLayout>
diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml
new file mode 100644
index 00000000..90060894
--- /dev/null
+++ b/res/layout/song_list_item.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:id="@id/drag_handle"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="?android:attr/listPreferredItemHeight">
+
+    <CheckedTextView
+            android:id="@+id/song_check"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:gravity="center_vertical"
+            android:checkMark="@drawable/btn_check"
+            android:paddingLeft="3dip"/>
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="0dip"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"
+                  android:layout_gravity="center_vertical">
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center_vertical">
+
+            <TextView
+                    android:id="@+id/song_title"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_gravity="left|center_vertical"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:singleLine="true"
+                    android:ellipsize="marquee"
+                    android:drawablePadding="6dip"
+                    android:paddingLeft="6dip"
+                    android:paddingRight="6dip"/>
+					
+			<ImageButton
+				android:id="@+id/song_star"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="right|center_vertical"
+				android:src="@drawable/ic_stat_star"
+				android:background="@null"
+				android:focusable="false"
+				android:visibility="gone"/>
+
+            <TextView
+                    android:id="@+id/song_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|center_vertical"
+                    android:drawablePadding="1dip"
+                    android:paddingRight="6dip"/>
+        </LinearLayout>
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center_vertical">
+
+            <TextView
+                    android:id="@+id/song_artist"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_gravity="left|center_vertical"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:singleLine="true"
+                    android:ellipsize="middle"
+                    android:paddingLeft="6dip"/>
+
+            <TextView
+                    android:id="@+id/song_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|center_vertical"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:singleLine="true"
+                    android:paddingLeft="3dip"
+                    android:paddingRight="4dip"/>
+
+        </LinearLayout>
+    </LinearLayout>
+	
+	<ImageView
+		android:id="@+id/artist_more"
+		android:src="@drawable/list_item_more"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		android:paddingRight="6dip"
+		android:background="@drawable/menubar_button"/>
+</LinearLayout>
diff --git a/res/layout/start_timer.xml b/res/layout/start_timer.xml
new file mode 100644
index 00000000..3b607a44
--- /dev/null
+++ b/res/layout/start_timer.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/timer_length_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/download.timer_length" />
+		<EditText
+			android:id="@+id/timer_length"
+			android:inputType="number"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:hint="@string/download.timer_length" />
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/sync_dialog.xml b/res/layout/sync_dialog.xml
new file mode 100644
index 00000000..5133b753
--- /dev/null
+++ b/res/layout/sync_dialog.xml
@@ -0,0 +1,12 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+    <CheckBox
+        android:id="@+id/sync_default"
+        style="?android:attr/textAppearanceMedium"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+		android:checked="false"
+		android:text="@string/offline.sync_dialog_default"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/tab_progress.xml b/res/layout/tab_progress.xml
new file mode 100644
index 00000000..6a88600c
--- /dev/null
+++ b/res/layout/tab_progress.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/tab_progress"
+              android:orientation="horizontal"
+              android:visibility="gone"
+              android:padding="10dp"
+              android:layout_gravity="top"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <ProgressBar
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="6dp"/>
+
+    <TextView
+            android:id="@+id/tab_progress_message"
+            android:text="@string/progress.wait"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/update_playlist.xml b/res/layout/update_playlist.xml
new file mode 100644
index 00000000..7354ef5c
--- /dev/null
+++ b/res/layout/update_playlist.xml
@@ -0,0 +1,70 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+		
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/get_playlist_name_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/common.name" />
+		<EditText
+			android:id="@+id/get_playlist_name"
+			android:inputType="text"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:hint="@string/common.name" />
+	</LinearLayout>
+		
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/get_playlist_comment_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/common.comment" />
+		<EditText
+			android:id="@+id/get_playlist_comment"
+			android:inputType="text"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:hint="@string/common.comment" />
+	</LinearLayout>
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/get_playlist_public_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/common.public" />
+		<CheckBox
+			android:id="@+id/get_playlist_public"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:checked="false"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3