diff options
author | Scott Jackson <daneren2005@gmail.com> | 2013-11-23 15:13:32 -0800 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2013-11-23 15:13:32 -0800 |
commit | e7039a7e10c3efcb5d637bbbaa0111b092a4e214 (patch) | |
tree | 24adffc215af1adea16b5cefe84c40c5967fb126 /res/xml | |
parent | 22a88ac31554301346ac20223bc22b949b1c344e (diff) | |
parent | b5f029b6ec6a22b4c8e6d1e7d61b77affb483a77 (diff) | |
download | dsub-e7039a7e10c3efcb5d637bbbaa0111b092a4e214.tar.gz dsub-e7039a7e10c3efcb5d637bbbaa0111b092a4e214.tar.bz2 dsub-e7039a7e10c3efcb5d637bbbaa0111b092a4e214.zip |
Merge branch 'master' of https://github.com/daneren2005/Subsonic into SyncAdapter
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/appwidget4x4.xml | 4 | ||||
-rw-r--r-- | res/xml/settings.xml | 6 |
2 files changed, 9 insertions, 1 deletions
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 diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 6f7527ab..777509de 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 |