diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-28 10:09:50 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 16:04:26 +0000 |
| commit | a484dc84d92839e821e7aa7de03c12495d566229 (patch) | |
| tree | adb436910c614ac5a5565079f8eceaf2bfa2920e /java/src/com/android/inputmethod/latin/settings/SettingsFragment.java | |
| parent | 1da438549368e74d55017c36d666673ad608a5c4 (diff) | |
| parent | 3c8a075a584018f58225377d0f09e84887a7d2f9 (diff) | |
| download | latinime-a484dc84d92839e821e7aa7de03c12495d566229.tar.gz latinime-a484dc84d92839e821e7aa7de03c12495d566229.tar.xz latinime-a484dc84d92839e821e7aa7de03c12495d566229.zip | |
Merge "Use fragment for gesture typing preference screen" into lmp-dev
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) { |