diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-28 12:09:05 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-28 12:09:05 +0000 |
| commit | beffde59c36515f77946b35c2b0279413a1df69f (patch) | |
| tree | 52b2496079c823f6f64e93ea90f47948a04ad970 /java/src/com/android/inputmethod/latin/utils/FragmentUtils.java | |
| parent | ac82983f65626c1db3fd878ba059807166ffbe36 (diff) | |
| parent | 1da438549368e74d55017c36d666673ad608a5c4 (diff) | |
| download | latinime-beffde59c36515f77946b35c2b0279413a1df69f.tar.gz latinime-beffde59c36515f77946b35c2b0279413a1df69f.tar.xz latinime-beffde59c36515f77946b35c2b0279413a1df69f.zip | |
am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
* commit '1da438549368e74d55017c36d666673ad608a5c4':
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()); |