diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-02-18 21:37:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-18 21:37:46 +0000 |
| commit | 86a2556aa79bde5a562b200f17b48f6812163ad5 (patch) | |
| tree | 587ab4574334ce5302afcaf537ba9baf71cafc29 | |
| parent | 5015e0f13bd54fc93f5aad5203a602c0a0674ca6 (diff) | |
| parent | c169ee6fdc4cb2798e22f929b24a0bf025b45e1c (diff) | |
| download | packages_apps_Settings-86a2556aa79bde5a562b200f17b48f6812163ad5.zip packages_apps_Settings-86a2556aa79bde5a562b200f17b48f6812163ad5.tar.gz packages_apps_Settings-86a2556aa79bde5a562b200f17b48f6812163ad5.tar.bz2 | |
Merge "Improve titles"
| -rw-r--r-- | res/xml/accessibility_settings.xml | 2 | ||||
| -rw-r--r-- | res/xml/application_settings.xml | 2 | ||||
| -rw-r--r-- | res/xml/device_info_memory.xml | 2 | ||||
| -rw-r--r-- | res/xml/power_usage_summary.xml | 2 | ||||
| -rw-r--r-- | res/xml/wifi_settings.xml | 2 | ||||
| -rw-r--r-- | res/xml/wireless_settings.xml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 666921a..9bbb670 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -16,7 +16,7 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" - android:title="@string/accessibility_settings_title"> + android:title="@string/accessibility_settings"> <PreferenceCategory android:key="services_category" diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml index 3329662..b49896c 100644 --- a/res/xml/application_settings.xml +++ b/res/xml/application_settings.xml @@ -22,7 +22,7 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/applications_settings_header" + android:title="@string/applications_settings" android:summary="@string/applications_settings_summary" android:key="applications_settings"> diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml index e905f39..e4ea1cc 100644 --- a/res/xml/device_info_memory.xml +++ b/res/xml/device_info_memory.xml @@ -15,7 +15,7 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/storage_settings_title"> + android:title="@string/storage_settings"> <!-- Preference categories are dynamically created based on the list of available storage volumes --> diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml index 5fcae5c..f6ee594 100644 --- a/res/xml/power_usage_summary.xml +++ b/res/xml/power_usage_summary.xml @@ -15,7 +15,7 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/battery_since_unplugged" + android:title="@string/power_usage_summary_title" android:key="app_list"> <Preference style="?android:attr/preferenceInformationStyle" diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml index d984d8f..75e8f61 100644 --- a/res/xml/wifi_settings.xml +++ b/res/xml/wifi_settings.xml @@ -15,6 +15,6 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/wifi_settings_category"> + android:title="@string/wifi_settings"> </PreferenceScreen> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index c7b9019..474eeb9 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -15,7 +15,7 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/wireless_networks_settings_title"> + android:title="@string/radio_controls_title"> <CheckBoxPreference android:key="toggle_airplane" |