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/AndroidManifest.xml b/AndroidManifest.xml
index 1ea703c..908c955 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,7 +66,7 @@
<!-- Wireless Controls -->
<activity android:name="WirelessSettings"
- android:label="@string/radio_controls_title"
+ android:label="@string/wireless_networks_settings_title"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -182,7 +182,8 @@
</intent-filter>
</activity>
- <activity android:name="LanguageSettings" android:label="@string/language_picker_title"
+ <activity android:name="LanguageSettings"
+ android:label="@string/language_keyboard_settings_title"
android:clearTaskOnLaunch="true"
>
<intent-filter>
@@ -215,7 +216,8 @@
</intent-filter>
</activity>
- <activity android:name="SoundAndDisplaySettings" android:label="@string/sound_and_display_settings"
+ <activity android:name="SoundAndDisplaySettings"
+ android:label="@string/sound_and_display_settings_title"
android:clearTaskOnLaunch="true"
>
<intent-filter>
@@ -292,7 +294,8 @@
</intent-filter>
</activity>
- <activity android:name="SecuritySettings" android:label="@string/security_settings_title"
+ <activity android:name="SecuritySettings"
+ android:label="@string/location_security_settings_title"
android:configChanges="orientation|keyboardHidden"
android:clearTaskOnLaunch="true"
>
@@ -316,8 +319,8 @@
</intent-filter>
</activity>
- <activity android:name="AccessibilitySettings" android:label="@string/accessibility_settings_title"
- android:theme="@android:style/Theme.NoTitleBar">
+ <activity android:name="AccessibilitySettings"
+ android:label="@string/accessibility_settings_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
@@ -372,7 +375,8 @@
</intent-filter>
</activity>
- <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title">
+ <activity android:name=".deviceinfo.Memory"
+ android:label="@string/storage_settings_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
diff --git a/res/layout/wifi_ap_configure.xml b/res/layout/wifi_ap_configure.xml
index 458fc87..f816ae5 100644
--- a/res/layout/wifi_ap_configure.xml
+++ b/res/layout/wifi_ap_configure.xml
@@ -39,14 +39,13 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/wifi_type_ssid" />
-
+
<EditText android:id="@+id/ssid_edit"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
- android:singleLine="true" />
-
-
+ android:singleLine="true"
+ android:inputType="textNoSuggestions" />
<!-- Security -->
@@ -115,7 +114,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:inputType="textNoSuggestions" />
<TextView android:id="@+id/anonymous_identity_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9c2d096..5c07d45 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -438,6 +438,8 @@
<string name="airplane_mode_turning_off">Enabling wireless connections\u2026</string>
<!-- Main Settings screen settings title for things like Wi-Fi, bluetooth, airplane mode. This will take you to another screen with those settings. -->
<string name="radio_controls_title">Wireless & networks</string>
+ <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+ <string name="wireless_networks_settings_title">Wireless & network settings</string>
<!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
<string name="radio_controls_summary">Manage Wi-Fi, Bluetooth, airplane mode, mobile networks, & VPNs</string>
@@ -489,6 +491,8 @@
<!-- Main Settings screen setting option title for the item to take you the security and location screen -->
<string name="security_settings_title">Location & security</string>
+ <!-- Location & security settings screen title -->
+ <string name="location_security_settings_title">Location & security settings</string>
<!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
<string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
<!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
@@ -816,6 +820,8 @@
<!-- Sound and alerts settings -->
<!-- Main Settings screen setting option name to go into the sound and display settings screen -->
<string name="sound_and_display_settings">Sound & display</string>
+ <!-- Main Settings screen setting option name to go into the sound and display settings screen -->
+ <string name="sound_and_display_settings_title">Sound & display settings</string>
<!-- Sound settings screen heading -->
<string name="sound_settings">Sound settings</string>
<!-- Main Settings screen setting option summary text for the item to go into the soudn and display settings screen-->
@@ -980,7 +986,9 @@
<!-- About phone screen, summary of the item to go into the phone status screen -->
<string name="device_status_summary">Phone number, signal, etc.</string>
<!-- Main settings screen item's title to go into the SD card and storage settings screen-->
- <string name="storage_settings_title">SD card & phone storage</string>
+ <string name="storage_settings">SD card & phone storage</string>
+ <!-- SD card and storage settings screen title -->
+ <string name="storage_settings_title">SD card & phone storage settings</string>
<!-- Main settings screen item's summary for the SD card and storage settings -->
<string name="storage_settings_summary">Unmount SD card, view available storage</string>
<!-- Do not translate. About phone, status item title -->
@@ -1432,6 +1440,8 @@
<!-- Language Settings --> <skip />
<!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings realted to locale and text -->
<string name="language_settings">Language & keyboard</string>
+ <!-- Title of Language and keyboard settings screen -->
+ <string name="language_keyboard_settings_title">Language & keyboard settings</string>
<!-- Summary of setting on main settings screen. This item will take the user to the screen to tweak settings realted to locale and text -->
<string name="language_settings_summary">Set locale (language and region), text input and auto-correction options</string>
<!-- On Text & language settings screen, heading. Inside the "Locale & text" screen, this is the header for settings that are for locale changes. -->
@@ -1672,8 +1682,10 @@
<!-- Accessibility settings -->
<skip/>
- <!-- Settings title for accessibility settings -->
- <string name="accessibility_settings_title">Accessibility</string>
+ <!-- Settings title in main settings screen for accessibility settings -->
+ <string name="accessibility_settings">Accessibility</string>
+ <!-- Settings title for accessibility settings screen -->
+ <string name="accessibility_settings_title">Accessibility settings</string>
<!-- Settings summary for accessibility settings -->
<string name="accessibility_settings_summary">Manage accessibility options</string>
<!-- Setting Checkbox title for enabling accessibility -->
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"
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index ef22ee1..4b30b53 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -29,6 +29,7 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.view.WindowManager;
import android.view.ContextMenu.ContextMenuInfo;
import android.widget.AlphabetIndexer;
import android.widget.EditText;
@@ -195,7 +196,7 @@
return mCursor.getString(
mCursor.getColumnIndexOrThrow(UserDictionary.Words.WORD));
}
-
+
@Override
protected Dialog onCreateDialog(int id) {
View content = getLayoutInflater().inflate(R.layout.dialog_edittext, null);
@@ -204,7 +205,7 @@
editText.setInputType(InputType.TYPE_CLASS_TEXT
| InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
- return new AlertDialog.Builder(this)
+ AlertDialog dialog = new AlertDialog.Builder(this)
.setTitle(mDialogEditingWord != null
? R.string.user_dict_settings_edit_dialog_title
: R.string.user_dict_settings_add_dialog_title)
@@ -219,7 +220,11 @@
if (mAutoReturn) finish();
}})
.create();
+ dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE |
+ WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+ return dialog;
}
+
@Override
protected void onPrepareDialog(int id, Dialog d) {
AlertDialog dialog = (AlertDialog) d;