Merge remote-tracking branch 'origin/DLNA' into DLNA

28 files changed, 119 insertions, 99 deletions

diff --git a/res/drawable-hdpi/btn_check_buttonless_off.png b/res/drawable-hdpi/btn_check_buttonless_off.png
deleted file mode 100644
index d705b420..00000000
--- a/res/drawable-hdpi/btn_check_buttonless_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/btn_check_buttonless_on.png b/res/drawable-hdpi/btn_check_buttonless_on.png
deleted file mode 100644
index a2612d7d..00000000
--- a/res/drawable-hdpi/btn_check_buttonless_on.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_drawer.png b/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index eb90af58..00000000
--- a/res/drawable-hdpi/ic_drawer.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index 1681d12c..00000000
--- a/res/drawable-mdpi/ic_drawer.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index daba1451..00000000
--- a/res/drawable-xhdpi/ic_drawer.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_drawer.png b/res/drawable-xxhdpi/ic_drawer.png
deleted file mode 100644
index 9c4685d6..00000000
--- a/res/drawable-xxhdpi/ic_drawer.png
+++ /dev/null
diff --git a/res/drawable/btn_check.xml b/res/drawable/btn_check.xml
deleted file mode 100644
index f363a2d2..00000000
--- a/res/drawable/btn_check.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true"
-        android:drawable="@drawable/btn_check_buttonless_on" />
-
-    <item android:state_checked="false"
-        android:drawable="@drawable/btn_check_buttonless_off" />
-        
-    <item
-        android:drawable="@drawable/btn_check_buttonless_off" />
-
-</selector>
diff --git a/res/layout/abstract_fragment_activity.xml b/res/layout/abstract_fragment_activity.xml
index 0702397f..0268ff87 100644
--- a/res/layout/abstract_fragment_activity.xml
+++ b/res/layout/abstract_fragment_activity.xml
@@ -23,8 +23,7 @@
 			android:layout_width="50dip"

 			android:layout_height="50dip"

 			android:layout_gravity="left|center"

-			android:scaleType="fitStart"

-			android:src="@drawable/unknown_album"/>

+			android:scaleType="fitStart"/>

 

 		<LinearLayout

 			android:layout_width="0dp"

diff --git a/res/layout/album_cell_item.xml b/res/layout/album_cell_item.xml
index 3dd79477..c1c8aa56 100644
--- a/res/layout/album_cell_item.xml
+++ b/res/layout/album_cell_item.xml
@@ -12,8 +12,7 @@
 		<github.daneren2005.dsub.view.SquareImageView

 			android:id="@+id/album_coverart"

 			android:layout_width="match_parent"

-			android:layout_height="match_parent"

-			android:src="@drawable/unknown_album"/>

+			android:layout_height="match_parent"/>

 

 		<RatingBar

 			android:id="@+id/album_rating"

diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml
index 27ab3c63..202843b6 100644
--- a/res/layout/album_list_item.xml
+++ b/res/layout/album_list_item.xml
@@ -13,8 +13,7 @@
 			android:id="@+id/album_coverart"

 			android:layout_width="@dimen/AlbumArt.Small"

 			android:layout_height="@dimen/AlbumArt.Small"

-			android:layout_gravity="left|center_vertical"

-			android:src="@drawable/unknown_album"/>

+			android:layout_gravity="left|center_vertical"/>

 

 		<RatingBar

 			android:id="@+id/album_rating"

@@ -71,6 +70,5 @@
 		android:layout_width="wrap_content"

 		android:layout_height="fill_parent"

 		android:layout_gravity="right|center_vertical"

-		android:paddingRight="10dip"

-		style="@style/BasicButton"/>

+		style="@style/MoreButton"/>

 </LinearLayout>

diff --git a/res/layout/basic_list_item.xml b/res/layout/basic_list_item.xml
index 84526324..f40aef2e 100644
--- a/res/layout/basic_list_item.xml
+++ b/res/layout/basic_list_item.xml
@@ -33,6 +33,5 @@
 		android:layout_width="wrap_content"

 		android:layout_height="fill_parent"

 		android:layout_gravity="right|center_vertical"

-		android:paddingRight="10dip"

-		style="@style/BasicButton"/>

+		style="@style/MoreButton"/>

 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/complex_list_item.xml b/res/layout/complex_list_item.xml
index 421295f2..a36cb2f6 100644
--- a/res/layout/complex_list_item.xml
+++ b/res/layout/complex_list_item.xml
@@ -45,6 +45,5 @@
 		android:layout_width="wrap_content"

 		android:layout_height="fill_parent"

 		android:layout_gravity="right|center_vertical"

-		android:paddingRight="10dip"

-		style="@style/BasicButton"/>

+		style="@style/MoreButton"/>

 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/grid_view.xml b/res/layout/grid_view.xml
index 40674c8d..7690d975 100644
--- a/res/layout/grid_view.xml
+++ b/res/layout/grid_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<GridView xmlns:android="http://schemas.android.com/apk/res/android"

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

diff --git a/res/layout/preferences.xml b/res/layout/preferences.xml
new file mode 100644
index 00000000..5caaa804
--- /dev/null
+++ b/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/res/layout/select_album_header.xml b/res/layout/select_album_header.xml
index a253aa31..abc16e58 100644
--- a/res/layout/select_album_header.xml
+++ b/res/layout/select_album_header.xml
@@ -6,7 +6,6 @@
 		
 	<ImageView
 		android:id="@+id/select_album_art"
-		android:src="@drawable/unknown_album"
 		android:layout_width="@dimen/AlbumArt.Header"
 		android:layout_height="@dimen/AlbumArt.Header"
 		android:layout_alignParentTop="true"
@@ -16,6 +15,7 @@
 		android:contentDescription="@null"/>
 
 	<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"
diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml
index d433df69..67d460f1 100644
--- a/res/layout/song_list_item.xml
+++ b/res/layout/song_list_item.xml
@@ -10,7 +10,7 @@
             android:layout_width="wrap_content"

             android:layout_height="fill_parent"

             android:gravity="center_vertical"

-            android:checkMark="@drawable/btn_check"

+            android:checkMark="?android:attr/listChoiceIndicatorMultiple"

             android:paddingLeft="3dip"/>

 

     <LinearLayout android:orientation="vertical"

@@ -122,6 +122,5 @@
 		android:layout_width="wrap_content"

 		android:layout_height="fill_parent"

 		android:layout_gravity="right|center_vertical"

-		android:paddingRight="10dip"

-		style="@style/BasicButton"/>

+		style="@style/MoreButton"/>

 </LinearLayout>

diff --git a/res/layout/user_list_item.xml b/res/layout/user_list_item.xml
index c4092894..ac408295 100644
--- a/res/layout/user_list_item.xml
+++ b/res/layout/user_list_item.xml
@@ -40,6 +40,5 @@
 		android:layout_width="wrap_content"

 		android:layout_height="fill_parent"

 		android:layout_gravity="right|center_vertical"

-		android:paddingRight="10dip"

-		style="@style/BasicButton"/>

+		style="@style/MoreButton"/>

 </LinearLayout>
\ No newline at end of file
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index fa887c28..39eb2206 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -18,6 +18,10 @@
 		android:title="@string/menu.top_tracks"/>
 
 	<item
+		android:id="@+id/menu_similar_artists"
+		android:title="@string/menu.similar_artists"/>
+
+	<item
 		android:id="@+id/menu_show_all"
 		android:title="@string/menu.show_all"/>
 
diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml
new file mode 100644
index 00000000..3b86fbcd
--- /dev/null
+++ b/res/menu/select_album_list.xml
@@ -0,0 +1,19 @@
+<?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_play_now"
+		android:icon="?media_button_start"
+		android:title="@string/menu.play"
+		compat:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/res/menu/similar_artists.xml b/res/menu/similar_artists.xml
new file mode 100644
index 00000000..bffa1837
--- /dev/null
+++ b/res/menu/similar_artists.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/menu_show_missing"
+		android:title="@string/menu.show_missing"/>
+</menu>
\ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e49d6197..777ef4fd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -192,8 +192,6 @@
     <string name="download.jukebox_server_too_old">Control remoto no soportado. Por favor, actualice su servidor Subsonic.</string>
     <string name="download.jukebox_offline">Control remoto no disponible en modo offline.</string>
     <string name="download.jukebox_not_authorized">Control remoto no permitido. Por favor, active el modo jukebox en <b>Users &gt; Settings</b> en su servidor Subsonic.</string>
-	<string name="download.show_downloading">Mostrar descargas</string>
-	<string name="download.show_now_playing">Mostrar reproduciendo ahora</string>
 	<string name="download.timer_length">Temporizador</string>
 	<string name="download.start_timer">Iniciar temporizador</string>
 	<string name="download.stop_timer">Detener temporizador</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6e0ff106..4b82ac85 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -560,6 +560,11 @@
 	<string name="tasker.start_playing_shuffled">Lejátszás indítása kevert sorrendben</string>

 	<string name="tasker.start_playing_title">Tasker -> DSub indítása</string>

 	<string name="tasker.edit_shuffle_mode">Indítás kevert sorrendben: </string>

+	<string name="tasker.edit_shuffle_start_year">Kevert sorrend kezdő év:</string>

+	<string name="tasker.edit_shuffle_end_year">Kevert sorrend utolsó év:</string>

+	<string name="tasker.edit_shuffle_genre">Kevert sorrend műfaja:</string>

+	<string name="tasker.edit_server_offline">Offline kapcsoló: </string>

+	<string name="tasker.edit_do_nothing">Ne csináljon semmit</string>

 

     <plurals name="select_album_n_songs">

         <item quantity="zero">Nincsenek dalok</item>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5a009228..03f10808 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -129,8 +129,6 @@
     <string name="download.jukebox_server_too_old">Удаленное управление не поддерживается. Пожалуйста, обновите Ваш сервер Subsonic.</string>

     <string name="download.jukebox_offline">Удаленное управление не поддерживается в оффлайн режиме.</string>

     <string name="download.jukebox_not_authorized">Удаленное управление запрещено. Пожалуйста, активируйте режим jukebox в разделе <b>Настройки &gt; Проигрыватели</b> на вашем сервере Subsonic.</string>

-	<string name="download.show_downloading">Показать закачки</string>

-	<string name="download.show_now_playing">Показать воспроизведение</string>

 	<string name="download.timer_length">Длительность</string>

 	<string name="download.start_timer">Запустить таймер</string>

 	<string name="download.stop_timer">Остановить таймер</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33a40981..314fc9bf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -104,6 +104,8 @@
 	<string name="menu.rescan">Rescan Server</string>

 	<string name="menu.rate">Set Rating</string>

 	<string name="menu.top_tracks">Last.FM Top Tracks</string>

+	<string name="menu.similar_artists">Similar Artists</string>

+	<string name="menu.show_missing">Show missing</string>

 

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

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

@@ -256,7 +258,7 @@
 

     <string name="error.label">Error</string>

 

-    <string name="settings.title">DSub settings</string>

+    <string name="settings.title">Settings</string>

     <string name="settings.test_connection_title">Test connection</string>

 	<string name="settings.servers_add">Add Server</string>

 	<string name="settings.servers_remove">Remove Server</string>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index e32811fa..43271afd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -4,6 +4,10 @@
 		<item name="android:background">@drawable/abc_item_background_holo_light</item>
 	</style>
 
+	<style name="MoreButton" parent="BasicButton">
+		<item name="android:paddingRight">14dip</item>
+	</style>
+
     <style name="PlaybackControl" parent="@style/BasicButton">
         <item name="android:scaleType">fitCenter</item>
         <item name="android:padding">6dip</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 129c0612..70f30e56 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -31,11 +31,12 @@
 		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
+		<item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
+		<item name="colorAccent">@color/cyan</item>
 	</style>
 	<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
-		<item name="android:textColorSecondary">@color/cyan</item>
 		<item name="offline_icon">@drawable/main_offline_dark</item>
 		<item name="media_button_backward">@drawable/media_backward_dark</item>
 		<item name="media_button_forward">@drawable/media_forward_dark</item>
@@ -64,42 +65,14 @@
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
+		<item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
+		<item name="colorAccent">@color/cyan</item>
 	</style>
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
 	</style>
-	<style name="Theme.DSub.Holo" parent="@style/Theme.AppCompat">
-		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
-		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
+	<style name="Theme.DSub.Holo" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@drawable/background</item>
-		<item name="offline_icon">@drawable/main_offline_dark</item>
-		<item name="media_button_backward">@drawable/media_backward_dark</item>
-		<item name="media_button_forward">@drawable/media_forward_dark</item>
-		<item name="media_button_pause">@drawable/media_pause_dark</item>
-		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
-		<item name="media_button_start">@drawable/media_start_dark</item>
-		<item name="media_button_stop">@drawable/media_stop_dark</item>
-		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
-		<item name="add">@drawable/ic_action_add_dark</item>
-		<item name="download_none">@drawable/download_none_dark</item>
-		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
-		<item name="refresh">@drawable/ic_menu_refresh_dark</item>
-		<item name="search">@drawable/ic_menu_search_dark</item>
-		<item name="remove">@drawable/ic_menu_remove_dark</item>
-		<item name="save">@drawable/ic_menu_save_dark</item>
-		<item name="volume">@drawable/ic_action_volume_dark</item>
-		<item name="toggle_list">@drawable/action_toggle_list_dark</item>
-		<item name="select_server">@drawable/main_select_server_dark</item>
-		<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="rating_bad">@drawable/ic_action_rating_bad_dark</item>
-		<item name="rating_good">@drawable/ic_action_rating_good_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>
 	</style>
 	
 	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
@@ -108,20 +81,13 @@
 		<item name="backgroundStacked">@android:color/transparent</item>
 		<item name="android:backgroundStacked">@android:color/transparent</item>
 	</style>
-	
+
 	<style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.AppCompat.ActionBar.Solid">
 		<item name="background">@android:color/transparent</item>
 		<item name="android:background">@android:color/transparent</item>
 		<item name="backgroundStacked">@android:color/transparent</item>
 		<item name="android:backgroundStacked">@android:color/transparent</item>
 	</style>
-	
-	<style name="Widget.DSub.ActionBarStyle.Holo" parent="Widget.AppCompat.ActionBar.Solid">
-		<item name="background">@android:color/transparent</item>
-		<item name="android:background">@android:color/transparent</item>
-		<item name="backgroundStacked">@android:color/transparent</item>
-		<item name="android:backgroundStacked">@android:color/transparent</item>
-	</style>
 
 	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
 	</style>
@@ -134,4 +100,8 @@
 	</style>
 	<style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button">
 	</style>
+
+	<style name="DSub.DrawerArrow" parent="Widget.AppCompat.DrawerArrowToggle">
+		<item name="spinBars">true</item>
+	</style>
 </resources>
diff --git a/res/xml/changelog.xml b/res/xml/changelog.xml
index 9c3e5040..11385ca6 100644
--- a/res/xml/changelog.xml
+++ b/res/xml/changelog.xml
@@ -1,5 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="4.9 Beta 2" versioncode="136" releasedate="1/15/2014">
+		<change>Fixed issue of DLNA not showing up for some people</change>
+		<change>Add artist info header (Subsonic 5.1+)</change>
+		<change>Add Similar Artists option (Subsonic 5.1+)</change>
+		<change>View similar artists missing from Subsonic (Subsonic 5.1+)</change>
+		<change>Podcasts: clicking on description wraps around image to display everything</change>
+		<change>Delete artwork/avatars on Clean Cache</change>
+		<change>Fix sleep timer incrementing on it's own</change>
+		<change>Fixed various crashes</change>
+	</release>
+	<release version="4.9 Beta 1" versioncode="135" releasedate="12/27/2014">
+		<change>Early DLNA support</change>
+		<change>I have only tested against XBMC.  I need feedback on what does and doesn't work</change>
+		<change>I know no metadata shows up.  I haven't been able to figure that part out yet.</change>
+	</release>
+	<release version="4.8.6" versioncode="134" releasedate="12/27/2014">
+		<change>Play/shuffle quick album lists such as Recently Added or Random</change>
+		<change>Change download status to a percentage</change>
+		<change>Improved unknown album art</change>
+		<change>Allow any size cache to be set</change>
+		<change>Improved search sort order</change>
+		<change>Fix settings coloring on older versions of Android</change>
+		<change>Fix sleep timer not remembering last value</change>
+		<change>Fix caching not working while casting</change>
+	</release>
+	<release version="4.8.5" versioncode="133" releasedate="11/26/2014">
+		<change>Fix crash on GB</change>
+		<change>Fix some theme issues</change>
+	</release>
+	<release version="4.8.4" versioncode="132" releasedate="11/22/2014">
+		<change>Partial Material Theme update</change>
+		<change>Make playing notification public for Lolipop</change>
+		<change>Fix Lolipop connectivity issues for some users</change>
+		<change>Fix cache from playlist view downloading starred songs instead</change>
+		<change>Fix remove from playlist not showing up on MusicCabinet servers</change>
+	</release>
+	<release version="4.8.3" versioncode="131" releasedate="11/14/2014">
+		<change>Fix color on Lolipop lockscreen notification</change>
+		<change>Various bug fixes</change>
+	</release>
 	<release version="4.8.2" versioncode="130" releasedate="11/2/2014">
 		<change>Improve automatic bookmark logic</change>
 		<change>Tasker: Toggle online/offline</change>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index d0dcdc43..0f044476 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -4,7 +4,7 @@
 	xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub"
 	android:title="@string/settings.title">
 
-    <PreferenceScreen
+	<PreferenceScreen
 		android:title="@string/settings.servers_title">
 
 		<PreferenceCategory
@@ -17,7 +17,7 @@
 				android:title="@string/settings.servers_add"/>
 		</PreferenceCategory>
 
-    </PreferenceScreen>
+	</PreferenceScreen>
 
 	<PreferenceScreen
 		android:title="@string/settings.appearance_title">
@@ -31,7 +31,7 @@
 				android:defaultValue="light"
 				android:entryValues="@array/themeValues"
 				android:entries="@array/themeNames"/>
-				
+
 			<CheckBoxPreference
 				android:title="@string/settings.theme_fullscreen"
 				android:summary="@string/settings.theme_fullscreen_summary"
@@ -212,13 +212,11 @@
 		<PreferenceCategory
 			android:title="@string/settings.cache_title">
 
-			<github.daneren2005.dsub.view.SeekBarPreference
+			<EditTextPreference
 				android:title="@string/settings.cache_size"
 				android:key="cacheSize"
 				android:defaultValue="2000"
-				android:dialogLayout="@layout/seekbar_preference"
-				myns:max="20000"
-				myns:display="%.0f MB"/>
+				android:digits="0123456789"/>
 
 			<EditTextPreference
 				android:title="@string/settings.cache_location"