Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show value for the theme pref too, no dummy defualt summaries

Browse Source
This commit is contained in:
Daniel Martí 2014-01-01 00:42:13 +01:00
parent 02bac89b17
commit 177b2a170d
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -159,6 +159,5 @@
<string name="compactlayout_on">Show icons at regular size</string> <string name="compactlayout_on">Show icons at regular size</string>
<string name="compactlayout_off">Show icons at a smaller size</string> <string name="compactlayout_off">Show icons at a smaller size</string>
<string name="theme">Theme</string> <string name="theme">Theme</string>
<string name="theme_long">Choose a theme to use</string>
</resources> </resources>

12
res/xml/preferences.xml
View File

@ -2,11 +2,11 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/updates"> <PreferenceCategory android:title="@string/updates">
<ListPreference android:title="@string/update_interval" <ListPreference android:title="@string/update_interval"
android:summary="@string/update_interval_zero" android:key="updateInterval" android:key="updateInterval"
android:defaultValue="24" android:entries="@array/updateIntervalNames" android:defaultValue="24" android:entries="@array/updateIntervalNames"
android:entryValues="@array/updateIntervalValues" /> android:entryValues="@array/updateIntervalValues" />
<CheckBoxPreference android:title="@string/automatic_scan_wifi" <CheckBoxPreference android:title="@string/automatic_scan_wifi"
android:defaultValue="false" android:summary="@string/automatic_scan_wifi_off" android:defaultValue="false"
android:key="updateOnWifiOnly" /> android:key="updateOnWifiOnly" />
<CheckBoxPreference android:title="@string/notify" <CheckBoxPreference android:title="@string/notify"
android:defaultValue="true" android:summary="@string/notify_updates_available" android:defaultValue="true" android:summary="@string/notify_updates_available"
@ -24,10 +24,10 @@
android:defaultValue="false" android:summary="@string/showPermissions_long" android:defaultValue="false" android:summary="@string/showPermissions_long"
android:key="showPermissions"/> android:key="showPermissions"/>
<CheckBoxPreference android:title="@string/compactlayout" <CheckBoxPreference android:title="@string/compactlayout"
android:defaultValue="false" android:summary="@string/compactlayout_off" android:defaultValue="false"
android:key="compactlayout"/> android:key="compactlayout"/>
<ListPreference android:title="@string/theme" <ListPreference android:title="@string/theme"
android:summary="@string/theme_long" android:key="theme" android:key="theme"
android:defaultValue="dark" android:defaultValue="dark"
android:entries="@array/themeNames" android:entries="@array/themeNames"
android:entryValues="@array/themeValues" /> android:entryValues="@array/themeValues" />
@ -37,10 +37,10 @@
android:defaultValue="false" android:summary="@string/show_incompat_versions_l" android:defaultValue="false" android:summary="@string/show_incompat_versions_l"
android:key="incompatibleVersions" /> android:key="incompatibleVersions" />
<CheckBoxPreference android:title="@string/rooted" <CheckBoxPreference android:title="@string/rooted"
android:defaultValue="true" android:summary="@string/rooted_on" android:defaultValue="true"
android:key="rooted" /> android:key="rooted" />
<CheckBoxPreference android:title="@string/ignoreTouch" <CheckBoxPreference android:title="@string/ignoreTouch"
android:defaultValue="false" android:summary="@string/ignoreTouch_off" android:defaultValue="false"
android:key="ignoreTouchscreen" /> android:key="ignoreTouchscreen" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/other"> <PreferenceCategory android:title="@string/other">

7
src/org/fdroid/fdroid/PreferencesActivity.java
View File

@ -68,6 +68,10 @@ public class PreferencesActivity extends PreferenceActivity implements
} else { } else {
updateInterval.setSummary(updateInterval.getEntry()); updateInterval.setSummary(updateInterval.getEntry());
} }
ListPreference theme = (ListPreference)findPreference(
Preferences.PREF_THEME);
theme.setSummary(theme.getEntry());
} }
@Override @Override
@ -165,6 +169,9 @@ public class PreferencesActivity extends PreferenceActivity implements
if (key.equals(Preferences.PREF_THEME)) { if (key.equals(Preferences.PREF_THEME)) {
result |= RESULT_RESTART; result |= RESULT_RESTART;
setResult(result); setResult(result);
ListPreference theme = (ListPreference)findPreference(
Preferences.PREF_THEME);
theme.setSummary(theme.getEntry());
return; return;
} }
} }