From 1ace88b03e75e07c69f3030b27a8d74750a73364 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Wed, 20 Nov 2013 18:47:33 -0800
Subject: #190 Added 4x4 widget to home screen

---
 res/xml/appwidget4x4.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'res/xml')

diff --git a/res/xml/appwidget4x4.xml b/res/xml/appwidget4x4.xml
index 40956dcf..ca2d1012 100644
--- a/res/xml/appwidget4x4.xml
+++ b/res/xml/appwidget4x4.xml
@@ -4,4 +4,6 @@
 	android:minHeight="250dp"
 	android:updatePeriodMillis="0"
 	android:resizeMode="horizontal|vertical"
-	android:initialLayout="@layout/appwidget4x4"/>
\ No newline at end of file
+	android:initialLayout="@layout/appwidget4x4"
+	android:initialKeyguardLayout="@layout/appwidget4x4"
+	android:widgetCategory="keyguard|home_screen"/>
\ No newline at end of file
-- 
cgit v1.2.3


From 773036c5bd8711e72ffe1958bed5f18d9745b73a Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 22 Nov 2013 19:08:39 -0800
Subject: Added setting for custom sort

---
 res/values/strings.xml | 2 ++
 res/xml/settings.xml   | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'res/xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1a4f8556..7647ac8a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -257,6 +257,8 @@
 	<string name="settings.theme_holo_fullscreen">Holo Fullscreen</string>
 	<string name="settings.track_title">Display Track #</string>
 	<string name="settings.track_summary">Display Track # in front of songs if one exists</string>
+	<string name="settings.custom_sort">Custom Sort</string>
+	<string name="settings.custom_sort_summary">Sort directory listings to properly sort by disc number.  Interferes with the servers sort albums by year.</string>
     <string name="settings.network_title">Network</string>
     <string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string>
     <string name="settings.max_bitrate_mobile">Max Audio bitrate - Mobile</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index f83f361c..07a88c08 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -43,6 +43,12 @@
 				android:key="hideWidget"
 				android:defaultValue="false"/>
 
+			<CheckBoxPreference
+				android:title="@string/settings.custom_sort"
+				android:summary="@string/settings.custom_sort_summary"
+				android:key="customSortEnabled"
+				android:defaultValue="true"/>
+
 		</PreferenceCategory>
 
 		<PreferenceCategory
-- 
cgit v1.2.3