From cfd014d38cba03ba05f571597b361ab253bff578 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 25 Apr 2015 17:03:02 -0700
Subject: Update to gradle

---
 app/src/main/res/layout/abstract_activity.xml      |  21 +++
 .../main/res/layout/abstract_fragment_activity.xml |  84 +++++++++++
 .../res/layout/abstract_fragment_container.xml     |   6 +
 app/src/main/res/layout/abstract_list_fragment.xml |  27 ++++
 app/src/main/res/layout/actionbar_spinner.xml      |  13 ++
 app/src/main/res/layout/album_cell_item.xml        |  89 ++++++++++++
 app/src/main/res/layout/album_list_item.xml        |  74 ++++++++++
 app/src/main/res/layout/appwidget4x1.xml           | 107 ++++++++++++++
 app/src/main/res/layout/appwidget4x2.xml           | 130 +++++++++++++++++
 app/src/main/res/layout/appwidget4x3.xml           | 113 +++++++++++++++
 app/src/main/res/layout/appwidget4x4.xml           | 115 +++++++++++++++
 app/src/main/res/layout/basic_count_item.xml       |  35 +++++
 app/src/main/res/layout/basic_list_item.xml        |  37 +++++
 app/src/main/res/layout/change_email.xml           |  28 ++++
 app/src/main/res/layout/change_password.xml        |  28 ++++
 app/src/main/res/layout/chat.xml                   |  53 +++++++
 app/src/main/res/layout/chat_item.xml              |  61 ++++++++
 app/src/main/res/layout/chat_item_reverse.xml      |  61 ++++++++
 app/src/main/res/layout/complex_list_item.xml      |  49 +++++++
 app/src/main/res/layout/confirm_password.xml       |  28 ++++
 app/src/main/res/layout/create_bookmark.xml        |  26 ++++
 app/src/main/res/layout/create_podcast.xml         |  27 ++++
 app/src/main/res/layout/create_user.xml            |  77 ++++++++++
 app/src/main/res/layout/download_activity.xml      |   4 +
 app/src/main/res/layout/download_media_buttons.xml |  63 +++++++++
 app/src/main/res/layout/download_playlist.xml      |  31 ++++
 app/src/main/res/layout/download_slider.xml        |  43 ++++++
 app/src/main/res/layout/drawer_list_item.xml       |  26 ++++
 app/src/main/res/layout/edit_play_action.xml       | 119 ++++++++++++++++
 app/src/main/res/layout/equalizer.xml              |  51 +++++++
 app/src/main/res/layout/equalizer_bar.xml          |  36 +++++
 app/src/main/res/layout/genre_list_item.xml        |  42 ++++++
 app/src/main/res/layout/grid_view.xml              |  14 ++
 app/src/main/res/layout/home.xml                   |  23 +++
 app/src/main/res/layout/jukebox_volume.xml         |  46 ++++++
 app/src/main/res/layout/lyrics.xml                 |  55 ++++++++
 app/src/main/res/layout/main_buttons.xml           | 157 +++++++++++++++++++++
 app/src/main/res/layout/notification.xml           |  83 +++++++++++
 app/src/main/res/layout/notification_expanded.xml  | 123 ++++++++++++++++
 app/src/main/res/layout/preferences.xml            |  10 ++
 app/src/main/res/layout/progress.xml               |  20 +++
 app/src/main/res/layout/rating.xml                 |  15 ++
 app/src/main/res/layout/save_playlist.xml          |  26 ++++
 app/src/main/res/layout/search_buttons.xml         |  73 ++++++++++
 app/src/main/res/layout/seekbar_preference.xml     |  18 +++
 app/src/main/res/layout/select_album.xml           |  28 ++++
 app/src/main/res/layout/select_album_header.xml    | 153 ++++++++++++++++++++
 app/src/main/res/layout/select_artist_header.xml   |  43 ++++++
 app/src/main/res/layout/shuffle_dialog.xml         |  80 +++++++++++
 app/src/main/res/layout/song_list_item.xml         | 126 +++++++++++++++++
 app/src/main/res/layout/start_timer.xml            |  21 +++
 app/src/main/res/layout/static_drawer_activity.xml |  23 +++
 app/src/main/res/layout/sync_dialog.xml            |  12 ++
 app/src/main/res/layout/tab_progress.xml           |  31 ++++
 app/src/main/res/layout/unscrollable_grid_view.xml |  11 ++
 app/src/main/res/layout/update_playlist.xml        |  70 +++++++++
 app/src/main/res/layout/update_share.xml           |  69 +++++++++
 app/src/main/res/layout/user_header.xml            |  57 ++++++++
 app/src/main/res/layout/user_list_item.xml         |  44 ++++++
 59 files changed, 3135 insertions(+)
 create mode 100644 app/src/main/res/layout/abstract_activity.xml
 create mode 100644 app/src/main/res/layout/abstract_fragment_activity.xml
 create mode 100644 app/src/main/res/layout/abstract_fragment_container.xml
 create mode 100644 app/src/main/res/layout/abstract_list_fragment.xml
 create mode 100644 app/src/main/res/layout/actionbar_spinner.xml
 create mode 100644 app/src/main/res/layout/album_cell_item.xml
 create mode 100644 app/src/main/res/layout/album_list_item.xml
 create mode 100644 app/src/main/res/layout/appwidget4x1.xml
 create mode 100644 app/src/main/res/layout/appwidget4x2.xml
 create mode 100644 app/src/main/res/layout/appwidget4x3.xml
 create mode 100644 app/src/main/res/layout/appwidget4x4.xml
 create mode 100644 app/src/main/res/layout/basic_count_item.xml
 create mode 100644 app/src/main/res/layout/basic_list_item.xml
 create mode 100644 app/src/main/res/layout/change_email.xml
 create mode 100644 app/src/main/res/layout/change_password.xml
 create mode 100644 app/src/main/res/layout/chat.xml
 create mode 100644 app/src/main/res/layout/chat_item.xml
 create mode 100644 app/src/main/res/layout/chat_item_reverse.xml
 create mode 100644 app/src/main/res/layout/complex_list_item.xml
 create mode 100644 app/src/main/res/layout/confirm_password.xml
 create mode 100644 app/src/main/res/layout/create_bookmark.xml
 create mode 100644 app/src/main/res/layout/create_podcast.xml
 create mode 100644 app/src/main/res/layout/create_user.xml
 create mode 100644 app/src/main/res/layout/download_activity.xml
 create mode 100644 app/src/main/res/layout/download_media_buttons.xml
 create mode 100644 app/src/main/res/layout/download_playlist.xml
 create mode 100644 app/src/main/res/layout/download_slider.xml
 create mode 100644 app/src/main/res/layout/drawer_list_item.xml
 create mode 100644 app/src/main/res/layout/edit_play_action.xml
 create mode 100644 app/src/main/res/layout/equalizer.xml
 create mode 100644 app/src/main/res/layout/equalizer_bar.xml
 create mode 100644 app/src/main/res/layout/genre_list_item.xml
 create mode 100644 app/src/main/res/layout/grid_view.xml
 create mode 100644 app/src/main/res/layout/home.xml
 create mode 100644 app/src/main/res/layout/jukebox_volume.xml
 create mode 100644 app/src/main/res/layout/lyrics.xml
 create mode 100644 app/src/main/res/layout/main_buttons.xml
 create mode 100644 app/src/main/res/layout/notification.xml
 create mode 100644 app/src/main/res/layout/notification_expanded.xml
 create mode 100644 app/src/main/res/layout/preferences.xml
 create mode 100644 app/src/main/res/layout/progress.xml
 create mode 100644 app/src/main/res/layout/rating.xml
 create mode 100644 app/src/main/res/layout/save_playlist.xml
 create mode 100644 app/src/main/res/layout/search_buttons.xml
 create mode 100644 app/src/main/res/layout/seekbar_preference.xml
 create mode 100644 app/src/main/res/layout/select_album.xml
 create mode 100644 app/src/main/res/layout/select_album_header.xml
 create mode 100644 app/src/main/res/layout/select_artist_header.xml
 create mode 100644 app/src/main/res/layout/shuffle_dialog.xml
 create mode 100644 app/src/main/res/layout/song_list_item.xml
 create mode 100644 app/src/main/res/layout/start_timer.xml
 create mode 100644 app/src/main/res/layout/static_drawer_activity.xml
 create mode 100644 app/src/main/res/layout/sync_dialog.xml
 create mode 100644 app/src/main/res/layout/tab_progress.xml
 create mode 100644 app/src/main/res/layout/unscrollable_grid_view.xml
 create mode 100644 app/src/main/res/layout/update_playlist.xml
 create mode 100644 app/src/main/res/layout/update_share.xml
 create mode 100644 app/src/main/res/layout/user_header.xml
 create mode 100644 app/src/main/res/layout/user_list_item.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/abstract_activity.xml b/app/src/main/res/layout/abstract_activity.xml
new file mode 100644
index 00000000..be65e437
--- /dev/null
+++ b/app/src/main/res/layout/abstract_activity.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/drawer_layout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+	<!-- The main content view -->
+	<FrameLayout
+		android:id="@+id/content_frame"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"/>
+	<!-- The navigation drawer -->
+	<ListView android:id="@+id/left_drawer"
+			  android:layout_width="240dp"
+			  android:layout_height="match_parent"
+			  android:layout_gravity="start"
+			  android:choiceMode="singleChoice"
+			  android:divider="@android:color/transparent"
+			  android:dividerHeight="0dp"
+			  android:background="?android:windowBackground"/>
+</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
new file mode 100644
index 00000000..d9c99f2f
--- /dev/null
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -0,0 +1,84 @@
+<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" >
+
+	<include layout="@layout/abstract_fragment_container" />
+
+	<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"
+		style="@style/BasicButton"
+		android:orientation="horizontal">
+
+		<github.daneren2005.dsub.view.RecyclingImageView
+			android:id="@+id/album_art"
+			android:layout_width="50dip"
+			android:layout_height="50dip"
+			android:layout_gravity="left|center"
+			android:scaleType="fitStart"/>
+
+		<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>
+
+		<LinearLayout
+			android:layout_height="wrap_content"
+			android:layout_width="0dp"
+			android:layout_weight="1">
+
+			<ImageButton
+				style="@style/PlaybackControl.Small"
+				android:id="@+id/download_previous"
+				android:src="?attr/media_button_backward"
+				android:layout_width="0dp"
+				android:layout_weight="1"/>
+
+			<ImageButton
+				style="@style/PlaybackControl.Small"
+				android:id="@+id/download_start"
+				android:src="?attr/media_button_start"
+				android:layout_width="0dp"
+				android:layout_weight="1"/>
+
+			<ImageButton
+				style="@style/PlaybackControl.Small"
+				android:id="@+id/download_next"
+				android:src="?attr/media_button_forward"
+				android:layout_width="0dp"
+				android:layout_weight="1"/>
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/abstract_fragment_container.xml b/app/src/main/res/layout/abstract_fragment_container.xml
new file mode 100644
index 00000000..61e17d1d
--- /dev/null
+++ b/app/src/main/res/layout/abstract_fragment_container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/fragment_container"
+	android:layout_width="match_parent"
+	android:layout_height="0px"
+	android:layout_weight="1"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/abstract_list_fragment.xml b/app/src/main/res/layout/abstract_list_fragment.xml
new file mode 100644
index 00000000..618a7341
--- /dev/null
+++ b/app/src/main/res/layout/abstract_list_fragment.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/refresh_layout"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<LinearLayout
+		android:id="@+id/fragment_list_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"/>
+
+		<ListView
+			android:id="@+id/fragment_list"
+			android:layout_width="fill_parent"
+			android:layout_height="0dip"
+			android:layout_weight="1.0"
+			android:fastScrollEnabled="true"/>
+
+		<include layout="@layout/tab_progress" />
+	</LinearLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/actionbar_spinner.xml b/app/src/main/res/layout/actionbar_spinner.xml
new file mode 100644
index 00000000..22055901
--- /dev/null
+++ b/app/src/main/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/app/src/main/res/layout/album_cell_item.xml b/app/src/main/res/layout/album_cell_item.xml
new file mode 100644
index 00000000..3f708e63
--- /dev/null
+++ b/app/src/main/res/layout/album_cell_item.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<github.daneren2005.dsub.view.SquareImageView
+			android:id="@+id/album_coverart"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"/>
+
+		<RatingBar
+			android:id="@+id/album_rating"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:isIndicator="true"
+			android:layout_centerHorizontal="true"
+			android:numStars="5"
+			style="@android:style/Widget.Holo.RatingBar.Small"
+			android:layout_alignParentBottom="true"
+			android:visibility="gone"/>
+	</RelativeLayout>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:paddingTop="4dp"
+		android:paddingLeft="2dp">
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:gravity="center_vertical"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/album_title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:singleLine="true"
+				android:ellipsize="marquee"
+				android:text="@string/search.albums"
+				android:textColor="?android:textColorPrimary"/>
+
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:id="@+id/album_artist"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content"
+					android:textSize="12sp"
+					android:textColor="?android:textColorSecondary"
+					android:singleLine="true"
+					android:text="@string/search.artists"/>
+
+				<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"
+					android:visibility="gone"/>
+			</LinearLayout>
+		</LinearLayout>
+
+		<ImageView
+			android:id="@+id/album_more"
+			android:src="?attr/download_none"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="right|center_vertical"
+			android:paddingRight="2dp"
+			style="@style/BasicButton"/>
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml
new file mode 100644
index 00000000..0ee92edd
--- /dev/null
+++ b/app/src/main/res/layout/album_list_item.xml
@@ -0,0 +1,74 @@
+<?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">
+
+	<RelativeLayout
+		android:layout_width="@dimen/AlbumArt.Small"
+		android:layout_height="@dimen/AlbumArt.Small">
+
+		<github.daneren2005.dsub.view.RecyclingImageView
+			android:id="@+id/album_coverart"
+			android:layout_width="@dimen/AlbumArt.Small"
+			android:layout_height="@dimen/AlbumArt.Small"
+			android:layout_gravity="left|center_vertical"/>
+
+		<RatingBar
+			android:id="@+id/album_rating"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:isIndicator="true"
+			android:layout_centerHorizontal="true"
+			android:numStars="5"
+			style="@android:style/Widget.Holo.RatingBar.Small"
+			android:layout_alignParentBottom="true"
+			android:visibility="gone"/>
+	</RelativeLayout>
+
+	<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"
+			android:paddingBottom="6dip"/>
+
+		<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"
+		android:visibility="gone"/>
+
+	<ImageView
+		android:id="@+id/album_more"
+		android:src="?attr/download_none"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		style="@style/MoreButton"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x1.xml b/app/src/main/res/layout/appwidget4x1.xml
new file mode 100644
index 00000000..8f52c872
--- /dev/null
+++ b/app/src/main/res/layout/appwidget4x1.xml
@@ -0,0 +1,107 @@
+<?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"
+	android:id="@+id/widget_root">
+
+    <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"
+			style="@style/BasicButton">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="marquee"
+                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="marquee"
+                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"
+                style="@style/BasicButton"
+                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"
+				style="@style/BasicButton" />
+
+            <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"
+				style="@style/BasicButton" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/appwidget4x2.xml b/app/src/main/res/layout/appwidget4x2.xml
new file mode 100644
index 00000000..5763fb01
--- /dev/null
+++ b/app/src/main/res/layout/appwidget4x2.xml
@@ -0,0 +1,130 @@
+<?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"
+	android:id="@+id/widget_root">
+
+    <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"
+			style="@style/BasicButton">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="marquee"
+                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="marquee"
+                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="marquee"
+                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"
+                style="@style/BasicButton"
+                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"
+				style="@style/BasicButton" />
+
+            <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"
+				style="@style/BasicButton" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/appwidget4x3.xml b/app/src/main/res/layout/appwidget4x3.xml
new file mode 100644
index 00000000..539b9f01
--- /dev/null
+++ b/app/src/main/res/layout/appwidget4x3.xml
@@ -0,0 +1,113 @@
+<?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"
+	android:id="@+id/widget_root">
+
+    <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"
+			style="@style/BasicButton">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="marquee"
+                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="marquee"
+                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"
+                style="@style/BasicButton"
+                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"
+				style="@style/BasicButton" />
+
+            <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"
+				style="@style/BasicButton" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/appwidget4x4.xml b/app/src/main/res/layout/appwidget4x4.xml
new file mode 100644
index 00000000..1f2db9e1
--- /dev/null
+++ b/app/src/main/res/layout/appwidget4x4.xml
@@ -0,0 +1,115 @@
+<?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"
+	android:id="@+id/widget_root">
+
+    <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"
+			style="@style/BasicButton">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="marquee"
+                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="marquee"
+                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"
+                style="@style/BasicButton"
+                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"
+				style="@style/BasicButton" />
+
+            <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"
+				style="@style/BasicButton" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/basic_count_item.xml b/app/src/main/res/layout/basic_count_item.xml
new file mode 100644
index 00000000..08d276db
--- /dev/null
+++ b/app/src/main/res/layout/basic_count_item.xml
@@ -0,0 +1,35 @@
+<?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:background="@android:color/transparent"
+	android:minHeight="50dip">
+
+	<TextView
+		android:id="@+id/basic_count_name"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:gravity="left|center_vertical"
+		android:paddingLeft="6dip"
+		android:paddingRight="6dip"
+		android:background="@android:color/transparent"
+		android:text="Text"/>
+
+	<TextView
+		android:id="@+id/basic_count_count"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginRight="12dp"
+		android:background="@drawable/ic_number_border"
+		android:focusable="false"
+		android:paddingRight="10dp"
+		android:layout_marginLeft="20px"
+		android:layout_marginBottom="4px"
+		android:text="99"
+		android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
+		android:textSize="11sp"
+		android:gravity="right|center_vertical"
+		android:layout_gravity="center_vertical"
+		android:visibility="gone"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/basic_list_item.xml b/app/src/main/res/layout/basic_list_item.xml
new file mode 100644
index 00000000..2338f7e0
--- /dev/null
+++ b/app/src/main/res/layout/basic_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/item_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/item_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"
+		android:visibility="gone"/>
+
+	<ImageView
+		android:id="@+id/item_more"
+		android:src="?attr/download_none"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		style="@style/MoreButton"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/change_email.xml b/app/src/main/res/layout/change_email.xml
new file mode 100644
index 00000000..18ffc765
--- /dev/null
+++ b/app/src/main/res/layout/change_email.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<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/new_email_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/admin.change_email_label" />
+		<EditText
+			android:id="@+id/new_email"
+			android:inputType="textEmailAddress"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/change_password.xml b/app/src/main/res/layout/change_password.xml
new file mode 100644
index 00000000..1a382a6b
--- /dev/null
+++ b/app/src/main/res/layout/change_password.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<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/new_password_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/admin.change_password_label" />
+		<EditText
+			android:id="@+id/new_password"
+			android:inputType="textPassword"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat.xml b/app/src/main/res/layout/chat.xml
new file mode 100644
index 00000000..89ad77ac
--- /dev/null
+++ b/app/src/main/res/layout/chat.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/refresh_layout"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<LinearLayout
+		android:id="@+id/chat_layout"
+		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="textCapSentences|textAutoCorrect|textLongMessage"
+				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>
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_item.xml b/app/src/main/res/layout/chat_item.xml
new file mode 100644
index 00000000..f31f7988
--- /dev/null
+++ b/app/src/main/res/layout/chat_item.xml
@@ -0,0 +1,61 @@
+<?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">
+
+	<github.daneren2005.dsub.view.RecyclingImageView
+		android:id="@+id/chat_avatar"
+		android:src="@drawable/ic_social_person"
+		android:layout_width="@dimen/AlbumArt.Small"
+		android:layout_height="@dimen/AlbumArt.Small"
+		android:layout_gravity="left|center_vertical"/>
+
+	<LinearLayout
+		android:layout_width="0dip"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:orientation="vertical" >
+
+		<LinearLayout
+			android:id="@+id/chat_message_layout"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="4dip"
+			android:orientation="horizontal" >
+
+			<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/textAppearanceLarge"
+				android:textColor="?android:textColorSecondary"/>
+
+			<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/textAppearanceSmall" />
+		</LinearLayout>
+
+		<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/app/src/main/res/layout/chat_item_reverse.xml b/app/src/main/res/layout/chat_item_reverse.xml
new file mode 100644
index 00000000..b8102193
--- /dev/null
+++ b/app/src/main/res/layout/chat_item_reverse.xml
@@ -0,0 +1,61 @@
+<?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">
+
+	<LinearLayout
+		android:layout_width="0dip"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:orientation="vertical" >
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="4dip"
+			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_marginRight="6dip"
+				android:singleLine="true"
+				android:text="00:00"
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+
+			<TextView
+				android:id="@+id/chat_username"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="6dip"
+				android:ellipsize="marquee"
+				android:singleLine="true"
+				android:text="User"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textColor="?android:textColorSecondary"/>
+		</LinearLayout>
+
+		<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="Chat message"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_gravity="right"/>
+	</LinearLayout>
+
+	<github.daneren2005.dsub.view.RecyclingImageView
+		android:id="@+id/chat_avatar"
+		android:src="@drawable/ic_social_person"
+		android:layout_width="@dimen/AlbumArt.Small"
+		android:layout_height="@dimen/AlbumArt.Small"
+		android:layout_gravity="right|center_vertical"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/complex_list_item.xml b/app/src/main/res/layout/complex_list_item.xml
new file mode 100644
index 00000000..67851eca
--- /dev/null
+++ b/app/src/main/res/layout/complex_list_item.xml
@@ -0,0 +1,49 @@
+<?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="?android:attr/listPreferredItemHeight"
+			  android:background="@android:color/transparent">
+
+	<LinearLayout android:orientation="vertical"
+		android:layout_width="0dip"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_gravity="center_vertical"
+		android:paddingLeft="6dip"
+		android:paddingRight="6dip"
+		android:gravity="left|center_vertical">
+
+		<TextView
+			android:id="@+id/item_name"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:background="@android:color/transparent"/>
+
+		<TextView
+			android:id="@+id/item_description"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:background="@android:color/transparent"/>
+	</LinearLayout>
+
+	<ImageButton
+		android:id="@+id/item_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"
+		android:visibility="gone"/>
+
+	<ImageView
+		android:id="@+id/item_more"
+		android:src="?attr/download_none"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		style="@style/MoreButton"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/confirm_password.xml b/app/src/main/res/layout/confirm_password.xml
new file mode 100644
index 00000000..27ee04ea
--- /dev/null
+++ b/app/src/main/res/layout/confirm_password.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<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/password_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/admin.add_user_password" />
+		<EditText
+			android:id="@+id/password"
+			android:inputType="textPassword"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/create_bookmark.xml b/app/src/main/res/layout/create_bookmark.xml
new file mode 100644
index 00000000..f72b39d8
--- /dev/null
+++ b/app/src/main/res/layout/create_bookmark.xml
@@ -0,0 +1,26 @@
+<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/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/comment_text"
+			android:inputType="text"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/create_podcast.xml b/app/src/main/res/layout/create_podcast.xml
new file mode 100644
index 00000000..5a2ec970
--- /dev/null
+++ b/app/src/main/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/app/src/main/res/layout/create_user.xml b/app/src/main/res/layout/create_user.xml
new file mode 100644
index 00000000..eac6e5cb
--- /dev/null
+++ b/app/src/main/res/layout/create_user.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<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/username_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/admin.add_user_username" />
+		<EditText
+			android:id="@+id/username"
+			android:inputType="text"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</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/email_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/admin.add_user_email" />
+		<EditText
+			android:id="@+id/email"
+			android:inputType="textEmailAddress"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</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/password_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/admin.add_user_password" />
+		<EditText
+			android:id="@+id/password"
+			android:inputType="textPassword"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</LinearLayout>
+
+	<ListView
+		android:id="@+id/settings_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/app/src/main/res/layout/download_activity.xml b/app/src/main/res/layout/download_activity.xml
new file mode 100644
index 00000000..017e4013
--- /dev/null
+++ b/app/src/main/res/layout/download_activity.xml
@@ -0,0 +1,4 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml
new file mode 100644
index 00000000..1affb164
--- /dev/null
+++ b/app/src/main/res/layout/download_media_buttons.xml
@@ -0,0 +1,63 @@
+<?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"
+			android:visibility="invisible"
+            />
+
+    <ImageButton
+            style="@style/PlaybackControl"
+            android:id="@+id/download_stop"
+            android:src="?attr/media_button_stop"
+            android:layout_centerInParent="true"
+			android:visibility="invisible"
+            />
+
+    <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="?attr/toggle_list"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml
new file mode 100644
index 00000000..8a73ef3b
--- /dev/null
+++ b/app/src/main/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/app/src/main/res/layout/download_slider.xml b/app/src/main/res/layout/download_slider.xml
new file mode 100644
index 00000000..bfd4c120
--- /dev/null
+++ b/app/src/main/res/layout/download_slider.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+		android:id="@+id/download_slider"
+        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/app/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml
new file mode 100644
index 00000000..5f17c9e9
--- /dev/null
+++ b/app/src/main/res/layout/drawer_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"
+	android:paddingTop="8dip"
+	android:paddingBottom="9dip">
+
+	<ImageView
+		android:id="@+id/drawer_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="left|center_vertical"
+		android:paddingTop="1dip"
+		android:paddingBottom="1dip"
+		android:paddingRight="8dip"
+		android:paddingLeft="10dip"/>
+
+	<TextView
+		android:id="@+id/drawer_name"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textSize="26sp"
+		android:singleLine="true"
+		android:textColor="?android:textColorPrimary"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/edit_play_action.xml b/app/src/main/res/layout/edit_play_action.xml
new file mode 100644
index 00000000..a1115da6
--- /dev/null
+++ b/app/src/main/res/layout/edit_play_action.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_shuffle_mode" />
+		<CheckBox
+			android:id="@+id/edit_shuffle_checkbox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:longClickable="true"
+			/>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_shuffle_start_year" />
+
+		<CheckBox
+			android:id="@+id/edit_start_year_checkbox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:longClickable="true"
+			android:enabled="false"/>
+
+		<EditText
+			android:id="@+id/edit_start_year"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="number"
+			android:hint="@string/shuffle.startYear"
+			android:enabled="false"/>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_shuffle_end_year" />
+
+		<CheckBox
+			android:id="@+id/edit_end_year_checkbox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:longClickable="true"
+			android:enabled="false"/>
+
+		<EditText
+			android:id="@+id/edit_end_year"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="number"
+			android:hint="@string/shuffle.endYear"
+			android:enabled="false"/>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_shuffle_genre"/>
+
+		<Button
+			android:id="@+id/edit_genre_spinner"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			style="?android:attr/spinnerStyle"
+			android:enabled="false"/>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_server_offline"/>
+
+		<Spinner
+			android:id="@+id/edit_offline_spinner"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/equalizer.xml b/app/src/main/res/layout/equalizer.xml
new file mode 100644
index 00000000..1c6cc833
--- /dev/null
+++ b/app/src/main/res/layout/equalizer.xml
@@ -0,0 +1,51 @@
+<?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:padding="16dip">
+
+    <CheckBox
+            android:id="@+id/equalizer_enabled"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/equalizer.enabled"
+            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/special_effects_layout"
+				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/app/src/main/res/layout/equalizer_bar.xml b/app/src/main/res/layout/equalizer_bar.xml
new file mode 100644
index 00000000..6dc91565
--- /dev/null
+++ b/app/src/main/res/layout/equalizer_bar.xml
@@ -0,0 +1,36 @@
+<?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: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: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/app/src/main/res/layout/genre_list_item.xml b/app/src/main/res/layout/genre_list_item.xml
new file mode 100644
index 00000000..6affa24c
--- /dev/null
+++ b/app/src/main/res/layout/genre_list_item.xml
@@ -0,0 +1,42 @@
+<?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/genre_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:singleLine="true"
+		android:ellipsize="marquee"
+		android:background="@android:color/transparent"/>
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:orientation="vertical"
+		android:gravity="right|center_vertical"
+		android:paddingRight="10dip"
+		android:background="@android:color/transparent">
+
+		<TextView
+			android:id="@+id/genre_songs"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+		<TextView
+			android:id="@+id/genre_albums"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceSmall"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/grid_view.xml b/app/src/main/res/layout/grid_view.xml
new file mode 100644
index 00000000..599cf92c
--- /dev/null
+++ b/app/src/main/res/layout/grid_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<github.daneren2005.dsub.view.HeaderGridView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/gridview"
+	android:layout_width="fill_parent"
+	android:layout_height="0dip"
+	android:layout_weight="1.0"
+	android:numColumns="@integer/Grid.Columns"
+	android:horizontalSpacing="10dp"
+	android:verticalSpacing="10dp"
+	android:gravity="center"
+	android:stretchMode="columnWidth"
+	android:padding="24px"
+	android:fastScrollEnabled="true"
+	android:scrollbarStyle="outsideOverlay"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home.xml b/app/src/main/res/layout/home.xml
new file mode 100644
index 00000000..e5bf5a70
--- /dev/null
+++ b/app/src/main/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/app/src/main/res/layout/jukebox_volume.xml b/app/src/main/res/layout/jukebox_volume.xml
new file mode 100644
index 00000000..0c49f634
--- /dev/null
+++ b/app/src/main/res/layout/jukebox_volume.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout
+		android:background="@drawable/toast_frame"
+		android:padding="20dip"
+		android:layout_height="fill_parent"
+		android:layout_width="fill_parent"
+		android:orientation="vertical"
+		android:id="@+id/toast_layout_root"
+		xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<TextView
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:id="@+id/jukebox_volume_title"
+		android:paddingBottom="12dp"
+		android:paddingRight="32dp"
+		android:paddingLeft="32dp"
+		android:shadowRadius="2.75"
+		android:shadowColor="#bb000000"
+		android:textColor="#ffffffff"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:text="@string/download.jukebox_volume"
+		android:gravity="center_horizontal"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentLeft="true"/>
+
+	<ImageView
+		android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
+		android:id="@+id/jukebox_volume_image"
+		android:paddingRight="12dip"
+		android:layout_alignParentLeft="true"
+		android:layout_below="@+id/jukebox_volume_title"
+		android:src="@drawable/ic_action_volume_dark"/>
+
+	<SeekBar
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:id="@+id/jukebox_volume_progress_bar"
+		android:paddingBottom="3dp"
+		android:layout_alignParentRight="true"
+		android:layout_below="@+id/jukebox_volume_title"
+		android:layout_toRightOf="@+id/jukebox_volume_image"
+		android:indeterminate="false"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lyrics.xml b/app/src/main/res/layout/lyrics.xml
new file mode 100644
index 00000000..747727bd
--- /dev/null
+++ b/app/src/main/res/layout/lyrics.xml
@@ -0,0 +1,55 @@
+<?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>
+
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/main_buttons.xml b/app/src/main/res/layout/main_buttons.xml
new file mode 100644
index 00000000..95a60409
--- /dev/null
+++ b/app/src/main/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="?attr/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"/>
+
+	<LinearLayout
+		android:id="@+id/main_albums"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<TextView
+			android:text="@string/main.albums_title"
+			style="@style/MainAlbumButtonLabel"
+			android:layout_width="0dp"
+			android:layout_weight="1"
+			android:layout_height="fill_parent"/>
+
+		<CheckBox
+			android:id="@+id/main_albums_per_folder"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/main.albums_per_folder"
+			android:layout_marginRight="6dp"
+			android:layout_gravity="right"/>
+	</LinearLayout>
+
+	<TextView
+		android:id="@+id/main_video_section"
+		android:text="@string/main.videos"
+		style="@style/MainAlbumButtonLabel"
+		android:layout_width="0dp"
+		android:layout_weight="1"
+		android:layout_height="fill_parent"/>
+
+	<LinearLayout
+		android:id="@+id/main_albums_newest"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:minHeight="46dip">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:text="@string/main.albums_newest"
+			style="@style/MainAlbumButton"/>
+
+		<TextView
+			android:id="@+id/main_albums_recent_count"
+			android:layout_width="32dp"
+			android:layout_height="32dp"
+			android:layout_marginRight="12dp"
+			android:background="@drawable/ic_number_border"
+			android:focusable="false"
+			android:paddingRight="10dp"
+			android:layout_marginLeft="20px"
+			android:layout_marginBottom="4px"
+			android:text="99"
+			android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
+			android:textSize="11sp"
+			android:gravity="right|center_vertical"
+			android:layout_gravity="center_vertical"
+			android:visibility="gone"/>
+	</LinearLayout>
+
+	<TextView
+		android:id="@+id/main_albums_recent"
+		android:text="@string/main.albums_recent"
+		style="@style/MainAlbumButton"/>
+	<TextView
+		android:id="@+id/main_albums_frequent"
+		android:text="@string/main.albums_frequent"
+		style="@style/MainAlbumButton"/>
+	<TextView
+		android:id="@+id/main_albums_highest"
+		android:text="@string/main.albums_highest"
+		style="@style/MainAlbumButton"/>
+	<TextView
+		android:id="@+id/main_albums_starred"
+		android:text="@string/main.albums_starred"
+		style="@style/MainAlbumButton"/>
+	<TextView
+		android:id="@+id/main_albums_genres"
+		android:text="@string/main.albums_genres"
+		style="@style/MainAlbumButton"/>
+	<TextView
+		android:id="@+id/main_albums_year"
+		android:text="@string/main.albums_year"
+		style="@style/MainAlbumButton"/>
+	<TextView
+		android:id="@+id/main_albums_random"
+		android:text="@string/main.albums_random"
+		style="@style/MainAlbumButton"/>
+	<TextView
+		android:id="@+id/main_albums_alphabetical"
+		android:text="@string/main.albums_alphabetical"
+		style="@style/MainAlbumButton"/>
+
+	<TextView
+		android:id="@+id/main_videos"
+		android:text="@string/main.videos"
+		style="@style/MainAlbumButton"/>
+
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
new file mode 100644
index 00000000..12efa4ec
--- /dev/null
+++ b/app/src/main/res/layout/notification.xml
@@ -0,0 +1,83 @@
+<?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="0dip"
+        android:layout_height="wrap_content"
+		android:layout_weight="1"
+        android:orientation="vertical"
+		android:paddingLeft="11.0dip"
+		android:layout_gravity="center_vertical">
+			
+		<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"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"/>
+    </LinearLayout>
+
+	<ImageButton
+		android:id="@+id/control_previous"
+		android:src="@drawable/notification_previous"
+		style="@style/BasicButton"
+		android:layout_width="46dip"
+		android:layout_height="fill_parent"
+		android:layout_gravity="center|right"
+		android:padding="8.0dip"
+		android:layout_weight="0.0"
+		android:scaleType="fitCenter"/>
+
+	<ImageButton
+		android:id="@+id/control_pause"
+		android:src="@drawable/notification_pause"
+		style="@style/BasicButton"
+		android:layout_width="46dip"
+		android:layout_height="fill_parent"
+		android:layout_gravity="center|right"
+		android:padding="8.0dip"
+		android:layout_weight="0.0"
+		android:scaleType="fitCenter"/>
+
+	<ImageButton
+		android:id="@+id/control_next"
+		android:src="@drawable/notification_next"
+		style="@style/BasicButton"
+		android:layout_width="46dip"
+		android:layout_height="fill_parent"
+		android:layout_gravity="center|right"
+		android:padding="8.0dip"
+		android:layout_weight="0.0"
+		android:scaleType="fitCenter"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/notification_expanded.xml b/app/src/main/res/layout/notification_expanded.xml
new file mode 100644
index 00000000..aa9fe759
--- /dev/null
+++ b/app/src/main/res/layout/notification_expanded.xml
@@ -0,0 +1,123 @@
+<?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" >
+
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<TextView
+				android:id="@+id/notification_title"
+				style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:layout_gravity="left"
+				android:ellipsize="marquee"
+				android:focusable="true"
+				android:singleLine="true" />
+
+			<ImageButton
+				android:id="@+id/notification_close"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="@drawable/notification_close"
+				style="@style/BasicButton"
+				android:padding="10dip"
+				android:layout_gravity="right"
+				android:visibility="gone"/>
+		</LinearLayout>
+
+	    <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" />
+
+		<ImageView
+			android:background="?android:dividerHorizontal"
+			android:layout_width="fill_parent"
+			android:layout_height="1.0px"/>
+	    
+	    <LinearLayout
+	        xmlns:android="http://schemas.android.com/apk/res/android"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:orientation="horizontal"
+			android:showDividers="middle"
+			android:divider="?android:listDivider">
+
+	        <ImageButton
+	            android:id="@+id/control_previous"
+				android:layout_width="0dip"
+				android:layout_height="fill_parent"
+	            android:layout_gravity="center"
+	            android:layout_weight="1"
+				android:padding="10dip"
+	            style="@style/BasicButton"
+	            android:scaleType="fitCenter"
+	            android:src="@drawable/notification_previous" />
+
+	        <ImageButton
+	            android:id="@+id/control_pause"
+				android:layout_width="0dip"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:padding="10dip"
+	            style="@style/BasicButton"
+	            android:scaleType="fitCenter"
+	            android:src="@drawable/notification_pause" />
+
+	        <ImageButton
+	            android:id="@+id/control_next"
+				android:layout_width="0dip"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:padding="10dip"
+	            style="@style/BasicButton"
+	            android:scaleType="fitCenter"
+	            android:src="@drawable/notification_next" />
+	    </LinearLayout>
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/preferences.xml b/app/src/main/res/layout/preferences.xml
new file mode 100644
index 00000000..5caaa804
--- /dev/null
+++ b/app/src/main/res/layout/preferences.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@android:id/list"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:drawSelectorOnTop="false"
+	android:scrollbarAlwaysDrawVerticalTrack="true"
+	android:paddingTop="6dp"
+	android:paddingLeft="12dp"
+	android:paddingRight="12dp"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/progress.xml b/app/src/main/res/layout/progress.xml
new file mode 100644
index 00000000..a1904c11
--- /dev/null
+++ b/app/src/main/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/app/src/main/res/layout/rating.xml b/app/src/main/res/layout/rating.xml
new file mode 100644
index 00000000..2753ef68
--- /dev/null
+++ b/app/src/main/res/layout/rating.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<RatingBar
+		android:id="@+id/rating_bar"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:numStars="5"
+		android:stepSize="1"
+		android:layout_gravity="center_horizontal"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/save_playlist.xml b/app/src/main/res/layout/save_playlist.xml
new file mode 100644
index 00000000..8bb21748
--- /dev/null
+++ b/app/src/main/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/app/src/main/res/layout/search_buttons.xml b/app/src/main/res/layout/search_buttons.xml
new file mode 100644
index 00000000..699ad341
--- /dev/null
+++ b/app/src/main/res/layout/search_buttons.xml
@@ -0,0 +1,73 @@
+<?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_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/app/src/main/res/layout/seekbar_preference.xml b/app/src/main/res/layout/seekbar_preference.xml
new file mode 100644
index 00000000..030b608b
--- /dev/null
+++ b/app/src/main/res/layout/seekbar_preference.xml
@@ -0,0 +1,18 @@
+<?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/value"
+		android:padding="5dip"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:gravity="right" />
+	<SeekBar
+		android:id="@+id/seek_bar"
+		android:padding="15dip"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/select_album.xml b/app/src/main/res/layout/select_album.xml
new file mode 100644
index 00000000..bbdf0e54
--- /dev/null
+++ b/app/src/main/res/layout/select_album.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/refresh_layout"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<LinearLayout
+		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"/>
+
+		<ListView
+			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>
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/select_album_header.xml b/app/src/main/res/layout/select_album_header.xml
new file mode 100644
index 00000000..d028a476
--- /dev/null
+++ b/app/src/main/res/layout/select_album_header.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/select_album_header_wrapper"
+	android:layout_height="wrap_content"
+	android:layout_width="fill_parent">
+
+	<RelativeLayout
+		android:id="@+id/select_album_header"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="top">
+
+		<LinearLayout
+			android:id="@+id/select_album_text_layout"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@+id/select_album_art"
+			android:orientation="vertical"
+			android:layout_centerVertical="true">
+
+			<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:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"
+				android:singleLine="true"
+				android:ellipsize="marquee"
+				android:marqueeRepeatLimit="marquee_forever"
+				android:scrollHorizontally="true"
+				android:focusable="true"
+				android:focusableInTouchMode="true">
+
+				<requestFocus android:focusable="true"
+					android:focusableInTouchMode="true"
+					android:duplicateParentState="true" />
+			</TextView>
+
+			<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:textAppearance="?android:attr/textAppearanceMedium"
+				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:paddingTop="14dip"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				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:textAppearance="?android:attr/textAppearanceSmall"
+				android:singleLine="true"
+				android:ellipsize="none"/>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:layout_alignParentRight="true"
+			android:padding="10dip">
+
+			<LinearLayout
+				android:id="@+id/select_album_rate_wrapper"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent">
+
+				<RatingBar
+					android:id="@+id/select_album_rate"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:numStars="5"
+					style="@android:style/Widget.Holo.RatingBar.Small"
+					android:layout_gravity="center_vertical"/>
+			</LinearLayout>
+
+			<ImageButton
+				android:id="@+id/select_album_star"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				style="@style/BasicButton"
+				android:src="@android:drawable/star_big_off"
+				android:layout_gravity="center_vertical"/>
+
+			<ImageView
+				android:id="@+id/select_album_share"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:scaleType="fitCenter"
+				android:src="?attr/share"
+				style="@style/BasicButton"
+				android:layout_gravity="center_vertical"/>
+		</LinearLayout>
+
+		<github.daneren2005.dsub.view.RecyclingImageView
+			android:id="@+id/select_album_art"
+			android:layout_width="@dimen/AlbumArt.Header"
+			android:layout_height="@dimen/AlbumArt.Header"
+			android:layout_alignParentTop="true"
+			android:layout_alignParentLeft="true"
+			android:layout_marginRight="10dip"
+			android:scaleType="fitCenter"
+			android:contentDescription="@null"/>
+	</RelativeLayout>
+
+	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:id="@+id/header_progress"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:clickable="true"
+		android:visibility="gone"
+		android:layout_gravity="top">
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:layout_gravity="center">
+
+			<ProgressBar
+				android:id="@+id/tab_progress_spinner"
+				style="?android:attr/progressBarStyleLarge"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginRight="6dp"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<TextView
+				android:id="@+id/tab_progress_message"
+				android:text="@string/progress.artist_info"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:textAppearance="?android:attr/textAppearanceMedium"/>
+		</LinearLayout>
+	</FrameLayout>
+</FrameLayout>
+
+
diff --git a/app/src/main/res/layout/select_artist_header.xml b/app/src/main/res/layout/select_artist_header.xml
new file mode 100644
index 00000000..2821ce43
--- /dev/null
+++ b/app/src/main/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="?attr/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/app/src/main/res/layout/shuffle_dialog.xml b/app/src/main/res/layout/shuffle_dialog.xml
new file mode 100644
index 00000000..295f57cb
--- /dev/null
+++ b/app/src/main/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/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml
new file mode 100644
index 00000000..86f77869
--- /dev/null
+++ b/app/src/main/res/layout/song_list_item.xml
@@ -0,0 +1,126 @@
+<?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="?android:attr/listChoiceIndicatorMultiple"
+            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_bookmark"
+				android:layout_width="24dp"
+				android:layout_height="24dp"
+				android:layout_gravity="right|center_vertical"
+				android:src="@drawable/ic_menu_bookmark_selected"
+				android:background="@null"
+				android:focusable="false"
+				android:scaleType="fitCenter"
+				android:visibility="gone"/>
+					
+			<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="2dip"/>
+
+			<ImageView
+				android:id="@+id/song_status_icon"
+				android:layout_width="24dip"
+				android:layout_height="24dip"
+				android:layout_gravity="center_vertical"
+				android:src="?attr/downloading"
+				android:visibility="gone"/>
+        </LinearLayout>
+
+        <LinearLayout
+			android:id="@+id/song_bottom"
+			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"/>
+
+			<RatingBar
+				android:id="@+id/song_rating"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:isIndicator="true"
+				android:layout_centerHorizontal="true"
+				android:numStars="5"
+				style="@android:style/Widget.Holo.RatingBar.Small"
+				android:visibility="gone"/>
+
+            <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="?attr/download_none"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		style="@style/MoreButton"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/start_timer.xml b/app/src/main/res/layout/start_timer.xml
new file mode 100644
index 00000000..9736a31d
--- /dev/null
+++ b/app/src/main/res/layout/start_timer.xml
@@ -0,0 +1,21 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:layout_gravity="center">
+
+	<TextView
+		android:id="@+id/timer_length_label"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="8dp"
+		android:textSize="20dp"
+		android:paddingRight="10px"
+		android:layout_gravity="center"/>
+
+	<SeekBar
+		android:id="@+id/timer_length_bar"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:max="97"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/static_drawer_activity.xml b/app/src/main/res/layout/static_drawer_activity.xml
new file mode 100644
index 00000000..db631540
--- /dev/null
+++ b/app/src/main/res/layout/static_drawer_activity.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/drawer_layout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="horizontal">
+
+	<!-- The navigation drawer -->
+	<ListView android:id="@+id/left_drawer"
+		android:layout_width="240dp"
+		android:layout_height="match_parent"
+		android:layout_gravity="start"
+		android:choiceMode="singleChoice"
+		android:divider="@android:color/transparent"
+		android:dividerHeight="0dp"
+		android:background="?android:windowBackground"/>
+
+	<!-- The main content view -->
+	<FrameLayout
+		android:id="@+id/content_frame"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sync_dialog.xml b/app/src/main/res/layout/sync_dialog.xml
new file mode 100644
index 00000000..5133b753
--- /dev/null
+++ b/app/src/main/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/app/src/main/res/layout/tab_progress.xml b/app/src/main/res/layout/tab_progress.xml
new file mode 100644
index 00000000..f6d326ca
--- /dev/null
+++ b/app/src/main/res/layout/tab_progress.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/tab_progress"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:clickable="true"
+	android:visibility="gone">
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:layout_gravity="center">
+
+		<ProgressBar
+			android:id="@+id/tab_progress_spinner"
+			style="?android:attr/progressBarStyleLarge"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginRight="6dp"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+
+		<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_horizontal"
+			android:textAppearance="?android:attr/textAppearanceMedium"/>
+	</LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/unscrollable_grid_view.xml b/app/src/main/res/layout/unscrollable_grid_view.xml
new file mode 100644
index 00000000..96bea5ce
--- /dev/null
+++ b/app/src/main/res/layout/unscrollable_grid_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<github.daneren2005.dsub.view.UnscrollableGridView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/gridview"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:numColumns="@integer/Grid.Columns"
+	android:horizontalSpacing="10dp"
+	android:verticalSpacing="10dp"
+	android:gravity="center"
+	android:padding="20px"
+	android:stretchMode="columnWidth"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/update_playlist.xml b/app/src/main/res/layout/update_playlist.xml
new file mode 100644
index 00000000..7354ef5c
--- /dev/null
+++ b/app/src/main/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
diff --git a/app/src/main/res/layout/update_share.xml b/app/src/main/res/layout/update_share.xml
new file mode 100644
index 00000000..92b7137b
--- /dev/null
+++ b/app/src/main/res/layout/update_share.xml
@@ -0,0 +1,69 @@
+<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_share_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_share_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_share_expire_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/share.expiration" />
+		<DatePicker
+			android:id="@+id/get_share_expire"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp"
+			android:calendarViewShown="false"/>
+	</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_share_no_expire_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/share.no_expiration" />
+		<CheckBox
+			android:id="@+id/get_share_no_expire"
+			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
diff --git a/app/src/main/res/layout/user_header.xml b/app/src/main/res/layout/user_header.xml
new file mode 100644
index 00000000..0b303afe
--- /dev/null
+++ b/app/src/main/res/layout/user_header.xml
@@ -0,0 +1,57 @@
+<?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">
+		
+	<github.daneren2005.dsub.view.RecyclingImageView
+		android:id="@+id/user_avatar"
+		android:src="@drawable/ic_social_person"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true"
+		android:layout_marginRight="10dip"
+		android:scaleType="fitCenter"
+		android:contentDescription="@null"/>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_toRightOf="@+id/user_avatar"
+		android:orientation="vertical"
+		android:layout_centerVertical="true">
+
+		<TextView
+			android:text="Username"
+			android:id="@+id/user_username"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:textStyle="bold"
+			android:singleLine="true"
+			android:ellipsize="marquee"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:scrollHorizontally="true"
+			android:focusable="true"
+			android:focusableInTouchMode="true">
+
+			<requestFocus android:focusable="true"
+				android:focusableInTouchMode="true"
+				android:duplicateParentState="true" />
+		</TextView>
+
+		<TextView
+			android:text="Email"
+			android:id="@+id/user_email"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:autoLink="email"/>
+
+	</LinearLayout>
+</RelativeLayout>
+
+
diff --git a/app/src/main/res/layout/user_list_item.xml b/app/src/main/res/layout/user_list_item.xml
new file mode 100644
index 00000000..dc2bdab9
--- /dev/null
+++ b/app/src/main/res/layout/user_list_item.xml
@@ -0,0 +1,44 @@
+<?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">
+
+	<github.daneren2005.dsub.view.RecyclingImageView
+		android:id="@+id/item_avatar"
+		android:src="@drawable/ic_social_person"
+		android:layout_width="@dimen/AlbumArt.Small"
+		android:layout_height="@dimen/AlbumArt.Small"
+		android:layout_gravity="left|center_vertical"/>
+
+	<TextView
+		android:id="@+id/item_name"
+		android:layout_width="0dip"
+		android:layout_height="match_parent"
+		android:layout_weight="1"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:gravity="left|center_vertical"
+		android:paddingLeft="12dip"
+		android:paddingRight="6dip"
+		android:minHeight="50dip"
+		android:background="@android:color/transparent"/>
+
+	<ImageButton
+		android:id="@+id/item_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"
+		android:visibility="gone"/>
+
+	<ImageView
+		android:id="@+id/item_more"
+		android:src="?attr/download_none"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_gravity="right|center_vertical"
+		style="@style/MoreButton"/>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3