Merge "Improve titles"
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"