Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Move Factory data reset to About phone.
Show input method when dialog to enter/edit new dictionary word is displayed.
Add title to Accessibility settings.
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index e9ded6c..4ff801f 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -106,5 +106,6 @@
android:dialogTitle="@string/apn_type"
android:key="apn_type"
android:singleLine="true"
+ android:inputType="textNoSuggestions"
/>
</PreferenceScreen>
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
index b7ec3c1..febd00f 100644
--- a/res/xml/device_info_memory.xml
+++ b/res/xml/device_info_memory.xml
@@ -38,13 +38,6 @@
style="?android:attr/preferenceInformationStyle"
android:title="@string/memory_available"
android:summary="00"/>
- <PreferenceScreen
- android:title="@string/master_clear_title"
- android:summary="@string/master_clear_summary">
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.MasterClear" />
- </PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 56810b4..81d33b2 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -120,4 +120,13 @@
android:title="@string/build_number"
android:summary="@string/device_info_default"/>
+ <!-- Factory reset -->
+ <PreferenceScreen
+ android:title="@string/master_clear_title"
+ android:summary="@string/master_clear_summary">
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.MasterClear" />
+ </PreferenceScreen>
+
</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 86893bd..47eb795 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -15,8 +15,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/language_settings">
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<PreferenceScreen
android:title="@string/phone_language"
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 588f651..769a86f 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -89,7 +89,7 @@
<com.android.settings.IconPreferenceScreen
settings:icon="@drawable/ic_settings_storage"
- android:title="@string/storage_settings_title">
+ android:title="@string/storage_settings">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.deviceinfo.Memory" />
@@ -125,7 +125,7 @@
<com.android.settings.IconPreferenceScreen
settings:icon="@drawable/ic_settings_accessibility"
- android:title="@string/accessibility_settings_title">
+ android:title="@string/accessibility_settings">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 71ea1a8..9110ced 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/radio_controls_title">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<CheckBoxPreference
android:key="toggle_airplane"