diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-28 12:18:09 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-28 12:18:09 +0000 |
| commit | 1f6cc6fb5740163cf3b1757bc11e6dc512f76078 (patch) | |
| tree | 8a29270482440db0a0a92320a8bf3d8238f53a76 /java/src/com/android/inputmethod/latin/utils/FragmentUtils.java | |
| parent | 275079c9ae279ec331c68cdec4bcdf83808f7a96 (diff) | |
| parent | a0a37bd368c2570f60106f30391d413e48d80f42 (diff) | |
| download | latinime-1f6cc6fb5740163cf3b1757bc11e6dc512f76078.tar.gz latinime-1f6cc6fb5740163cf3b1757bc11e6dc512f76078.tar.xz latinime-1f6cc6fb5740163cf3b1757bc11e6dc512f76078.zip | |
am a0a37bd3: am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
* commit 'a0a37bd368c2570f60106f30391d413e48d80f42':
Use fragment for multi lingual preference screen
Diffstat (limited to 'java/src/com/android/inputmethod/latin/utils/FragmentUtils.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/FragmentUtils.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/FragmentUtils.java b/java/src/com/android/inputmethod/latin/utils/FragmentUtils.java index 5d77097b2..a44c5764a 100644 --- a/java/src/com/android/inputmethod/latin/utils/FragmentUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/FragmentUtils.java @@ -18,9 +18,10 @@ package com.android.inputmethod.latin.utils; import com.android.inputmethod.dictionarypack.DictionarySettingsFragment; import com.android.inputmethod.latin.about.AboutPreferences; -import com.android.inputmethod.latin.settings.AdditionalSubtypeSettings; +import com.android.inputmethod.latin.settings.CustomInputStyleSettingsFragment; import com.android.inputmethod.latin.settings.DebugSettings; import com.android.inputmethod.latin.settings.InputSettingsFragment; +import com.android.inputmethod.latin.settings.MultiLingualSettingsFragment; import com.android.inputmethod.latin.settings.SettingsFragment; import com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsFragment; import com.android.inputmethod.latin.userdictionary.UserDictionaryAddWordFragment; @@ -36,7 +37,8 @@ public class FragmentUtils { sLatinImeFragments.add(DictionarySettingsFragment.class.getName()); sLatinImeFragments.add(AboutPreferences.class.getName()); sLatinImeFragments.add(InputSettingsFragment.class.getName()); - sLatinImeFragments.add(AdditionalSubtypeSettings.class.getName()); + sLatinImeFragments.add(MultiLingualSettingsFragment.class.getName()); + sLatinImeFragments.add(CustomInputStyleSettingsFragment.class.getName()); sLatinImeFragments.add(DebugSettings.class.getName()); sLatinImeFragments.add(SettingsFragment.class.getName()); sLatinImeFragments.add(SpellCheckerSettingsFragment.class.getName()); |