diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-07-27 10:56:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-27 10:56:23 -0700 |
| commit | b7cdf167bb60217b4e94c0612117efc0d54cdf73 (patch) | |
| tree | a96ce4d2dfbc5b2dfa70cb5f5252f4cf40ab60cc /res/xml | |
| parent | 7485addd8c230812b33f7043de3ff47d97b79bc1 (diff) | |
| parent | a4379d6b38e568fcb60831d6f2fa349ba20f9b82 (diff) | |
| download | packages_apps_Settings-b7cdf167bb60217b4e94c0612117efc0d54cdf73.tar.gz packages_apps_Settings-b7cdf167bb60217b4e94c0612117efc0d54cdf73.tar.bz2 packages_apps_Settings-b7cdf167bb60217b4e94c0612117efc0d54cdf73.zip | |
Merge "Use a different wallpaper fragment title from the preference item."
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/power_usage_summary.xml | 5 | ||||
| -rw-r--r-- | res/xml/wallpaper_settings.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml index b49b1409f..5fcae5c83 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 63346f7ac..bb9e80998 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> |