diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-04-30 07:11:13 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-04-30 07:11:13 +0000 |
| commit | 71c1e50fdb47c78b3180cc6b04d4cababe3f3fe2 (patch) | |
| tree | caefd6adc419dd75b54b153554b52289878ddbdd | |
| parent | 01170ffebeb4a604667abb84310ed4e910f97bf7 (diff) | |
| parent | 5aa14c26361b3f45be7c0746f0db4ffbdc41b75d (diff) | |
| download | latinime-71c1e50fdb47c78b3180cc6b04d4cababe3f3fe2.tar.gz latinime-71c1e50fdb47c78b3180cc6b04d4cababe3f3fe2.tar.xz latinime-71c1e50fdb47c78b3180cc6b04d4cababe3f3fe2.zip | |
Merge "Fix the title of the fragment of the personal dictionary"
| -rw-r--r-- | java/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsFragment.java | 5 |
2 files changed, 0 insertions, 14 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index a5567daa7..85abb08fe 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -559,15 +559,6 @@ Tip: You can download and remove dictionaries by going to <b>Language & i <string name="version_text">Version <xliff:g id="version_number" example="1.0.1864.643521">%1$s</xliff:g></string> <!-- User dictionary settings --> - <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. --> - <!-- This resource is corresponding to msgid="765659257455000490" --> - <string name="user_dict_settings_titlebar">User 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] --> - <!-- This resource is corresponding to msgid="524997218433540614" --> - <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] --> - <!-- This resource is corresponding to msgid="3735224433307996276" --> - <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" translatable="false">""</string> <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. --> diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java index 830cae9b8..835ef7b46 100644 --- a/java/src/com/android/inputmethod/latin/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java @@ -420,10 +420,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment // not present or disabled. In this case we need to remove the preference. getPreferenceScreen().removePreference(userDictionaryPreference); } 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(UserDictionarySettings.class.getName()); // If the size of localeList is 0, we don't set the locale parameter in the // extras. This will be interpreted by the UserDictionarySettings class as @@ -436,7 +432,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment userDictionaryPreference.getExtras().putString("locale", locale); } } else { - userDictionaryPreference.setTitle(R.string.user_dict_multiple_settings_title); userDictionaryPreference.setFragment(UserDictionaryList.class.getName()); } } |