diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-28 12:14:23 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-28 12:14:23 +0000 |
| commit | 2d64f7c097bb0246e8c1ac1a1f82c175c40c4e41 (patch) | |
| tree | 15d9d80c4d20e4b7190f8cef2d434035f3bc721d /java/src/com/android/inputmethod/latin/settings/SettingsFragment.java | |
| parent | a0a37bd368c2570f60106f30391d413e48d80f42 (diff) | |
| parent | f63a044c6649f3cabc3b612ed5bd79b6601f52ae (diff) | |
| download | latinime-2d64f7c097bb0246e8c1ac1a1f82c175c40c4e41.tar.gz latinime-2d64f7c097bb0246e8c1ac1a1f82c175c40c4e41.tar.xz latinime-2d64f7c097bb0246e8c1ac1a1f82c175c40c4e41.zip | |
am f63a044c: am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
* commit 'f63a044c6649f3cabc3b612ed5bd79b6601f52ae':
Use fragment for gesture typing preference screen
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsFragment.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsFragment.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java index f0bc27972..363cb498d 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java @@ -117,8 +117,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment ensureConsistencyOfAutoCorrectionSettings(); - final PreferenceScreen gestureScreen = - (PreferenceScreen) findPreference(Settings.SCREEN_GESTURE); final PreferenceScreen correctionScreen = (PreferenceScreen) findPreference(Settings.SCREEN_CORRECTION); final PreferenceScreen advancedScreen = @@ -196,7 +194,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment } if (!Settings.readFromBuildConfigIfGestureInputEnabled(res)) { - getPreferenceScreen().removePreference(gestureScreen); + getPreferenceScreen().removePreference(findPreference(Settings.SCREEN_GESTURE)); } AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(context, this); @@ -210,7 +208,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment public void onResume() { super.onResume(); final SharedPreferences prefs = getPreferenceManager().getSharedPreferences(); - final Resources res = getResources(); final TwoStatePreference showSetupWizardIcon = (TwoStatePreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON); if (showSetupWizardIcon != null) { |