Merge branch 'Admin'

44 files changed, 357 insertions, 0 deletions

diff --git a/res/drawable-hdpi/ic_menu_add_person_dark.png b/res/drawable-hdpi/ic_menu_add_person_dark.png
new file mode 100644
index 00000000..971048d5
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_person_dark.png
diff --git a/res/drawable-hdpi/ic_menu_add_person_light.png b/res/drawable-hdpi/ic_menu_add_person_light.png
new file mode 100644
index 00000000..f94446d0
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_person_light.png
diff --git a/res/drawable-hdpi/ic_menu_admin_dark.png b/res/drawable-hdpi/ic_menu_admin_dark.png
new file mode 100644
index 00000000..76da5ade
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_admin_dark.png
diff --git a/res/drawable-hdpi/ic_menu_admin_light.png b/res/drawable-hdpi/ic_menu_admin_light.png
new file mode 100644
index 00000000..5431889c
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_admin_light.png
diff --git a/res/drawable-hdpi/ic_menu_password_dark.png b/res/drawable-hdpi/ic_menu_password_dark.png
new file mode 100644
index 00000000..67fa3e84
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_password_dark.png
diff --git a/res/drawable-hdpi/ic_menu_password_light.png b/res/drawable-hdpi/ic_menu_password_light.png
new file mode 100644
index 00000000..bd99c01f
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_password_light.png
diff --git a/res/drawable-hdpi/ic_social_person.png b/res/drawable-hdpi/ic_social_person.png
new file mode 100644
index 00000000..0a0a5ff2
--- /dev/null
+++ b/res/drawable-hdpi/ic_social_person.png
diff --git a/res/drawable-mdpi/ic_menu_add_person_dark.png b/res/drawable-mdpi/ic_menu_add_person_dark.png
new file mode 100644
index 00000000..7d64f5d3
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_person_dark.png
diff --git a/res/drawable-mdpi/ic_menu_add_person_light.png b/res/drawable-mdpi/ic_menu_add_person_light.png
new file mode 100644
index 00000000..55c38c26
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_person_light.png
diff --git a/res/drawable-mdpi/ic_menu_admin_dark.png b/res/drawable-mdpi/ic_menu_admin_dark.png
new file mode 100644
index 00000000..f88f5f15
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_admin_dark.png
diff --git a/res/drawable-mdpi/ic_menu_admin_light.png b/res/drawable-mdpi/ic_menu_admin_light.png
new file mode 100644
index 00000000..35cd14f4
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_admin_light.png
diff --git a/res/drawable-mdpi/ic_menu_password_dark.png b/res/drawable-mdpi/ic_menu_password_dark.png
new file mode 100644
index 00000000..74d0095a
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_password_dark.png
diff --git a/res/drawable-mdpi/ic_menu_password_light.png b/res/drawable-mdpi/ic_menu_password_light.png
new file mode 100644
index 00000000..159f7889
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_password_light.png
diff --git a/res/drawable-mdpi/ic_social_person.png b/res/drawable-mdpi/ic_social_person.png
new file mode 100644
index 00000000..c09313d8
--- /dev/null
+++ b/res/drawable-mdpi/ic_social_person.png
diff --git a/res/drawable-xhdpi/ic_menu_add_person_dark.png b/res/drawable-xhdpi/ic_menu_add_person_dark.png
new file mode 100644
index 00000000..30c78e5a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add_person_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_add_person_light.png b/res/drawable-xhdpi/ic_menu_add_person_light.png
new file mode 100644
index 00000000..b3fb3808
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add_person_light.png
diff --git a/res/drawable-xhdpi/ic_menu_admin_dark.png b/res/drawable-xhdpi/ic_menu_admin_dark.png
new file mode 100644
index 00000000..09f90c15
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_admin_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_admin_light.png b/res/drawable-xhdpi/ic_menu_admin_light.png
new file mode 100644
index 00000000..4bd3beaf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_admin_light.png
diff --git a/res/drawable-xhdpi/ic_menu_password_dark.png b/res/drawable-xhdpi/ic_menu_password_dark.png
new file mode 100644
index 00000000..d1fc0a97
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_password_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_password_light.png b/res/drawable-xhdpi/ic_menu_password_light.png
new file mode 100644
index 00000000..1cbf085c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_password_light.png
diff --git a/res/drawable-xhdpi/ic_social_person.png b/res/drawable-xhdpi/ic_social_person.png
new file mode 100644
index 00000000..ed333afe
--- /dev/null
+++ b/res/drawable-xhdpi/ic_social_person.png
diff --git a/res/drawable-xxhdpi/ic_menu_add_person_dark.png b/res/drawable-xxhdpi/ic_menu_add_person_dark.png
new file mode 100644
index 00000000..446985ea
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_add_person_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_add_person_light.png b/res/drawable-xxhdpi/ic_menu_add_person_light.png
new file mode 100644
index 00000000..0f1d36bc
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_add_person_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_admin_dark.png b/res/drawable-xxhdpi/ic_menu_admin_dark.png
new file mode 100644
index 00000000..0e57c9ed
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_admin_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_admin_light.png b/res/drawable-xxhdpi/ic_menu_admin_light.png
new file mode 100644
index 00000000..63ab2f83
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_admin_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_password_dark.png b/res/drawable-xxhdpi/ic_menu_password_dark.png
new file mode 100644
index 00000000..a7cd1a6d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_password_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_password_light.png b/res/drawable-xxhdpi/ic_menu_password_light.png
new file mode 100644
index 00000000..5670a209
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_password_light.png
diff --git a/res/drawable-xxhdpi/ic_social_person.png b/res/drawable-xxhdpi/ic_social_person.png
new file mode 100644
index 00000000..f81dc6a4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_social_person.png
diff --git a/res/layout/change_email.xml b/res/layout/change_email.xml
new file mode 100644
index 00000000..8b74215c
--- /dev/null
+++ b/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/res/layout/change_password.xml b/res/layout/change_password.xml
new file mode 100644
index 00000000..ad3e9cd8
--- /dev/null
+++ b/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/res/layout/create_user.xml b/res/layout/create_user.xml
new file mode 100644
index 00000000..4d918fc9
--- /dev/null
+++ b/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/res/layout/user_header.xml b/res/layout/user_header.xml
new file mode 100644
index 00000000..5966e0ed
--- /dev/null
+++ b/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">
+		
+	<ImageView
+		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/res/layout/user_list_item.xml b/res/layout/user_list_item.xml
new file mode 100644
index 00000000..657dd910
--- /dev/null
+++ b/res/layout/user_list_item.xml
@@ -0,0 +1,45 @@
+<?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">

+

+	<ImageView

+		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"

+		android:paddingRight="10dip"

+		android:background="@drawable/menubar_button"/>

+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/admin.xml b/res/menu/admin.xml
new file mode 100644
index 00000000..f16e89f7
--- /dev/null
+++ b/res/menu/admin.xml
@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"

+	  xmlns:compat="http://schemas.android.com/apk/res-auto">

+	<item

+		android:id="@+id/menu_add_user"

+		android:title="@string/menu.add_user"

+		android:icon="?attr/add_person"

+		compat:showAsAction="always|withText"/>

+

+	<item

+		android:id="@+id/menu_exit"

+		android:title="@string/menu.exit"/>

+</menu>
\ No newline at end of file
diff --git a/res/menu/admin_context.xml b/res/menu/admin_context.xml
new file mode 100644
index 00000000..922a24a9
--- /dev/null
+++ b/res/menu/admin_context.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<menu xmlns:android="http://schemas.android.com/apk/res/android"

+	  xmlns:compat="http://schemas.android.com/apk/res-auto">

+

+	<item

+		android:id="@+id/admin_change_email"

+		android:title="@string/admin.change_email"/>

+

+	<item

+		android:id="@+id/admin_change_password"

+		android:title="@string/admin.change_password"/>

+

+	<item

+		android:id="@+id/admin_delete_user"

+		android:title="@string/admin.delete_user"/>

+</menu>

diff --git a/res/menu/admin_context_user.xml b/res/menu/admin_context_user.xml
new file mode 100644
index 00000000..cc4c1ab9
--- /dev/null
+++ b/res/menu/admin_context_user.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<menu xmlns:android="http://schemas.android.com/apk/res/android"

+	  xmlns:compat="http://schemas.android.com/apk/res-auto">

+

+	<item

+		android:id="@+id/admin_change_password"

+		android:title="@string/admin.change_password"/>

+</menu>
\ No newline at end of file
diff --git a/res/menu/empty.xml b/res/menu/empty.xml
index cf7b82de..7abe954b 100644
--- a/res/menu/empty.xml
+++ b/res/menu/empty.xml
@@ -2,4 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	  xmlns:compat="http://schemas.android.com/apk/res-auto">
 
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/user.xml b/res/menu/user.xml
new file mode 100644
index 00000000..aea881fc
--- /dev/null
+++ b/res/menu/user.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<menu xmlns:android="http://schemas.android.com/apk/res/android"

+	  xmlns:compat="http://schemas.android.com/apk/res-auto">

+

+	<item

+		android:id="@+id/menu_update_permissions"

+		android:title="@string/admin.update_permissions"

+		android:icon="?attr/save"

+		compat:showAsAction="always|withText"/>

+

+	<item

+		android:id="@+id/menu_change_password"

+		android:title="@string/admin.change_password"

+		android:icon="?attr/password"

+		compat:showAsAction="always|withText"/>

+

+	<item

+		android:id="@+id/menu_change_email"

+		android:title="@string/admin.change_email"/>

+

+	<item

+		android:id="@+id/menu_exit"

+		android:title="@string/menu.exit"/>

+</menu>
\ No newline at end of file
diff --git a/res/menu/user_user.xml b/res/menu/user_user.xml
new file mode 100644
index 00000000..f66aa793
--- /dev/null
+++ b/res/menu/user_user.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>

+<menu xmlns:android="http://schemas.android.com/apk/res/android"

+	  xmlns:compat="http://schemas.android.com/apk/res-auto">

+

+	<item

+		android:id="@+id/menu_change_password"

+		android:title="@string/admin.change_password"

+		android:icon="?attr/password"

+		compat:showAsAction="always|withText"/>

+

+	<item

+		android:id="@+id/menu_exit"

+		android:title="@string/menu.exit"/>

+</menu>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f6ee767f..deb8fdf5 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -8,6 +8,7 @@
 		<item>@string/button_bar.bookmarks</item>
 		<item>@string/button_bar.shares</item>
 		<item>@string/button_bar.chat</item>
+		<item>@string/button_bar.admin</item>
 		<item>@string/button_bar.downloading</item>
 		<item>@string/menu.settings</item>
 	</string-array>
@@ -20,6 +21,7 @@
 		<item>Bookmark</item>
 		<item>Share</item>
 		<item>Chat</item>
+		<item>Admin</item>
 		<item>Download</item>
 		<item>Settings</item>
 	</string-array>
@@ -32,6 +34,7 @@
 		<item>@drawable/ic_menu_bookmark_light</item>
 		<item>@drawable/ic_menu_share_light</item>
 		<item>@drawable/ic_menu_chat_light</item>
+		<item>@drawable/ic_menu_admin_light</item>
 		<item>@drawable/ic_menu_download_light</item>
 		<item>@drawable/ic_menu_settings_light</item>
 	</array>
@@ -44,6 +47,7 @@
 		<item>@drawable/ic_menu_bookmark_dark</item>
 		<item>@drawable/ic_menu_share_dark</item>
 		<item>@drawable/ic_menu_chat_dark</item>
+		<item>@drawable/ic_menu_admin_dark</item>
 		<item>@drawable/ic_menu_download_dark</item>
 		<item>@drawable/ic_menu_settings_dark</item>
 	</array>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d025a48f..ac535487 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -21,5 +21,7 @@
 	<attr name="downloading" format="reference"/>
 	<attr name="bookmark" format="reference"/>
 	<attr name="share" format="reference"/>
+	<attr name="add_person" format="reference"/>
+	<attr name="password" format="reference"/>
 	<attr name="drawerItemsIcons" format="reference"/>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fd0efec4..e4e9d299 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,6 +35,7 @@
 	<string name="button_bar.bookmarks">Bookmarks</string>

 	<string name="button_bar.shares">Shares</string>

 	<string name="button_bar.chat">Chat</string>

+	<string name="button_bar.admin">Admin</string>

 	<string name="button_bar.downloading">Downloading</string>

 

     <string name="main.welcome_title">Welcome!</string>

@@ -99,6 +100,7 @@
 	<string name="menu.delete_cache">Delete Cache</string>

 	<string name="menu.cast">Cast To Device</string>

 	<string name="menu.faq">FAQ</string>

+	<string name="menu.add_user">Add User</string>

 

     <string name="playlist.label">Playlists</string>

 	<string name="playlist.update_info">Update Information</string>

@@ -414,6 +416,8 @@
 	<string name="settings.play_now_after_summary">Play Now context menu for a song plays everything after selected item (like the Subsonic web GUI)</string>

 	<string name="settings.large_album_art">Large Album Art</string>

 	<string name="settings.large_album_art_summary">Display albums with large album art instead of in a list</string>

+	<string name="settings.admin_enabled">Admin Enabled</string>

+	<string name="settings.admin_enabled_summary">Whether or not to display the admin listing in the pull out drawer</string>

 

 	<string name="shuffle.title">Shuffle By</string>

 	<string name="shuffle.startYear">Start Year:</string>

@@ -441,6 +445,29 @@
 	<string name="share.via">Share via</string>

 	<string name="share.delete">Delete Share</string>

 

+	<string name="admin.add_user_username">Username:</string>

+	<string name="admin.add_user_email">Email:</string>

+	<string name="admin.add_user_password">Password:</string>

+	<string name="admin.create_user_success">Successfully created new user</string>

+	<string name="admin.create_user_error">Failed to create new user</string>

+	<string name="admin.change_username_invalid">Enter a valid username</string>

+	<string name="admin.update_permissions">Update Permissions</string>

+	<string name="admin.update_permissions_success">Successfully updated permission for %1$s</string>

+	<string name="admin.update_permissions_error">Failed to update permissions for %1$s</string>

+	<string name="admin.change_email">Change Email</string>

+	<string name="admin.change_email_success">Successfully changed email for %1$s</string>

+	<string name="admin.change_email_error">Failed to change email for %1$s</string>

+	<string name="admin.change_email_label">New Email:</string>

+	<string name="admin.change_email_invalid">Enter a valid email</string>

+	<string name="admin.change_password">Change Password</string>

+	<string name="admin.change_password_success">Successfully changed password for %1$s</string>

+	<string name="admin.change_password_error">Failed to change password for %1$s</string>

+	<string name="admin.change_password_label">New Password:</string>

+	<string name="admin.change_password_invalid">Enter a valid password</string>

+	<string name="admin.delete_user">Delete User</string>

+	<string name="admin.delete_user_success">Successfully deleted %1$s</string>

+	<string name="admin.delete_user_error">Failed to delete %1$s</string>

+

     <string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string>

 

     <string name="background_task.wait">Please wait...</string>

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 677ee4e1..6611cff7 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -24,6 +24,8 @@
 		<item name="downloading">@drawable/downloading_light</item>
 		<item name="bookmark">@drawable/ic_menu_bookmark_light</item>
 		<item name="share">@drawable/ic_menu_share_light</item>
+		<item name="add_person">@drawable/ic_menu_add_person_light</item>
+		<item name="password">@drawable/ic_menu_password_light</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
@@ -53,6 +55,8 @@
 		<item name="downloading">@drawable/downloading_dark</item>
 		<item name="bookmark">@drawable/ic_menu_bookmark_dark</item>
 		<item name="share">@drawable/ic_menu_share_dark</item>
+		<item name="add_person">@drawable/ic_menu_add_person_dark</item>
+		<item name="password">@drawable/ic_menu_password_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
@@ -85,6 +89,8 @@
 		<item name="downloading">@drawable/downloading_dark</item>
 		<item name="bookmark">@drawable/ic_menu_bookmark_dark</item>
 		<item name="share">@drawable/ic_menu_share_dark</item>
+		<item name="add_person">@drawable/ic_menu_add_person_dark</item>
+		<item name="password">@drawable/ic_menu_password_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 9f1b5b67..cf3868f5 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -139,6 +139,12 @@
 				android:summary="@string/settings.shares_enabled_summary"
 				android:key="sharedEnabled"
 				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.admin_enabled"
+				android:summary="@string/settings.admin_enabled_summary"
+				android:key="adminEnabled"
+				android:defaultValue="true"/>
 		</PreferenceCategory>
 
 		<PreferenceCategory