PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the title of the fragments of the personal dictionary settings

Browse Source 
Bug: 8600958
Change-Id: I9b8bab21b144385bc2386e7fcb67e1c197f84113
This commit is contained in:
Satoshi Kataoka
2013-04-30 14:30:12 +09:00
parent 5c460bbafe
commit 5df3307309
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -511,7 +511,7 @@
</receiver> </receiver>
<activity android:name="Settings$UserDictionarySettingsActivity" <activity android:name="Settings$UserDictionarySettingsActivity"
android:label="@string/user_dict_settings_titlebar" android:label="@string/user_dict_settings_title"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity"> android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter> <intent-filter>
@@ -531,7 +531,7 @@
</activity> </activity>
<activity android:name=".inputmethod.UserDictionaryAddWordActivity" <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
android:label="@string/user_dict_settings_titlebar" android:label="@string/user_dict_settings_title"
android:theme="@android:style/Theme.Holo.Dialog.NoActionBar" android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
android:windowSoftInputMode="stateVisible" android:windowSoftInputMode="stateVisible"
android:noHistory="true" android:noHistory="true"
@@ -546,7 +546,7 @@
<!-- Keep compatibility with old shortcuts. --> <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="UserDictionarySettings" <activity-alias android:name="UserDictionarySettings"
android:label="@string/user_dict_settings_titlebar" android:label="@string/user_dict_settings_title"
android:exported="true" android:exported="true"
android:targetActivity="Settings$UserDictionarySettingsActivity"> android:targetActivity="Settings$UserDictionarySettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

10
res/values/strings.xml
View File

@@ -2929,13 +2929,9 @@
<string name="keyboard_layout_picker_title">Keyboard layouts</string> <string name="keyboard_layout_picker_title">Keyboard layouts</string>
<!-- User dictionary settings --><skip /> <!-- User dictionary settings --><skip />
<!-- User dictionary settings, The titlebar text of the User dictionary settings screen. --> <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
<string name="user_dict_settings_titlebar">User dictionary</string> <string name="user_dict_settings_title">Personal dictionary</string>
<!-- User dictionary settings, The title of the list item to go into the User dictionary settings screen when there is only one user dictionary. [CHAR LIMIT=35] --> <!-- User dictionary settings. The summary of the list item to go into the Personal dictionary settings screen. -->
<string name="user_dict_single_settings_title">Personal dictionary</string>
<!-- User dictionary settings, The title of the list item to go into the User dictionary list when there are several user dictionaries. [CHAR LIMIT=35] -->
<string name="user_dict_multiple_settings_title">Personal dictionaries</string>
<!-- User dictionary settings. The summary of the listem item to go into the User dictionary settings screen. -->
<string name="user_dict_settings_summary">""</string> <string name="user_dict_settings_summary">""</string>
<!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. --> <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
<string name="user_dict_settings_add_menu_title">Add</string> <string name="user_dict_settings_add_menu_title">Add</string>

3
res/xml/language_settings.xml
View File

@@ -29,7 +29,8 @@
<!-- User dictionary preference title and fragment will be set programmatically. --> <!-- User dictionary preference title and fragment will be set programmatically. -->
<PreferenceScreen <PreferenceScreen
android:key="key_user_dictionary_settings" /> android:key="key_user_dictionary_settings"
android:title="@string/user_dict_settings_title" />
<PreferenceCategory android:key="keyboard_settings_category" <PreferenceCategory android:key="keyboard_settings_category"
android:title="@string/keyboard_settings_category"> android:title="@string/keyboard_settings_category">

5
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

@@ -199,10 +199,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
// not present or disabled. In this case we need to remove the preference. // not present or disabled. In this case we need to remove the preference.
getPreferenceScreen().removePreference(userDictionaryPreference); getPreferenceScreen().removePreference(userDictionaryPreference);
} else if (localeList.size() <= 1) { } else if (localeList.size() <= 1) {
final Intent intent =
new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
userDictionaryPreference.setIntent(intent);
userDictionaryPreference.setFragment( userDictionaryPreference.setFragment(
com.android.settings.UserDictionarySettings.class.getName()); com.android.settings.UserDictionarySettings.class.getName());
// If the size of localeList is 0, we don't set the locale parameter in the // If the size of localeList is 0, we don't set the locale parameter in the
@@ -216,7 +212,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
userDictionaryPreference.getExtras().putString("locale", locale); userDictionaryPreference.getExtras().putString("locale", locale);
} }
} else { } else {
userDictionaryPreference.setTitle(R.string.user_dict_multiple_settings_title);
userDictionaryPreference.setFragment(UserDictionaryList.class.getName()); userDictionaryPreference.setFragment(UserDictionaryList.class.getName());
} }
} }