diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-07-22 10:34:58 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-07-25 14:09:57 -0700 |
| commit | a4379d6b38e568fcb60831d6f2fa349ba20f9b82 (patch) | |
| tree | c864ae3fb36b7da46c80e8a2639dc63c2352aace /res | |
| parent | 8374a2db64f772c5e934ccd2e47f0df4b5928012 (diff) | |
| download | packages_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')
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/power_usage_summary.xml | 5 | ||||
| -rw-r--r-- | res/xml/wallpaper_settings.xml | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 72db3d0..282030f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1522,6 +1522,8 @@ <string name="screen_timeout_summary">Screen turns off automatically after <xliff:g id="timeout_description">%1$s</xliff:g></string> <!-- Wallpaper settings title [CHAR LIMIT=30] --> <string name="wallpaper_settings_title">Wallpaper</string> + <!-- Wallpaper settings fragment title [CHAR LIMIT=30] --> + <string name="wallpaper_settings_fragment_title">Select wallpaper from</string> <!-- Display settings screen, trigger for screen saver options --> <string name="dream_settings_title">Android Dreams</string> <!-- Display settings screen, summary for screen saver options --> @@ -2724,6 +2726,8 @@ found in the list of installed applications.</string> <string name="power_usage_summary">What has been using the battery</string> <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] --> <string name="power_usage_not_available">Battery usage data not available</string> + <!-- Display the battery level and status [CHAR_LIMIT=30] --> + <string name="power_usage_level_and_status">Battery level <xliff:g id="level">%1$s</xliff:g> - <xliff:g id="status">%2$s</xliff:g></string> <!-- Battery usage since unplugged --> <string name="battery_since_unplugged">Battery use since unplugged</string> <!-- Battery usage since user reset the stats --> 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> |