summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-07-22 10:34:58 -0700
committerAmith Yamasani <yamasani@google.com>2011-07-25 14:09:57 -0700
commita4379d6b38e568fcb60831d6f2fa349ba20f9b82 (patch)
treec864ae3fb36b7da46c80e8a2639dc63c2352aace /res/xml
parent8374a2db64f772c5e934ccd2e47f0df4b5928012 (diff)
downloadpackages_apps_settings-a4379d6b38e568fcb60831d6f2fa349ba20f9b82.zip
packages_apps_settings-a4379d6b38e568fcb60831d6f2fa349ba20f9b82.tar.gz
packages_apps_settings-a4379d6b38e568fcb60831d6f2fa349ba20f9b82.tar.bz2
Use a different wallpaper fragment title from the preference item.
Change wallpaper list ordering to alphabetic. Display battery level and charging status in Battery settings. Change-Id: I8ead0fb0f018c79ed258bd1c1ca3f8ecaf32da83
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/power_usage_summary.xml5
-rw-r--r--res/xml/wallpaper_settings.xml2
2 files changed, 6 insertions, 1 deletions
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index b49b140..5fcae5c 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -17,4 +17,9 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/battery_since_unplugged"
android:key="app_list">
+ <Preference
+ style="?android:attr/preferenceInformationStyle"
+ android:key="battery_status"
+ android:persistent="false"
+ />
</PreferenceScreen>
diff --git a/res/xml/wallpaper_settings.xml b/res/xml/wallpaper_settings.xml
index 63346f7..bb9e809 100644
--- a/res/xml/wallpaper_settings.xml
+++ b/res/xml/wallpaper_settings.xml
@@ -15,6 +15,6 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/wallpaper_settings_title">
+ android:title="@string/wallpaper_settings_fragment_title">
</PreferenceScreen>