diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-28 12:09:06 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-28 12:09:06 +0000 |
| commit | f63a044c6649f3cabc3b612ed5bd79b6601f52ae (patch) | |
| tree | 7365e180e48968e0fa462e989acd8540a6fe778c /java/src/com/android/inputmethod/latin/settings/SettingsFragment.java | |
| parent | beffde59c36515f77946b35c2b0279413a1df69f (diff) | |
| parent | a484dc84d92839e821e7aa7de03c12495d566229 (diff) | |
| download | latinime-f63a044c6649f3cabc3b612ed5bd79b6601f52ae.tar.gz latinime-f63a044c6649f3cabc3b612ed5bd79b6601f52ae.tar.xz latinime-f63a044c6649f3cabc3b612ed5bd79b6601f52ae.zip | |
am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
* commit 'a484dc84d92839e821e7aa7de03c12495d566229':
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) { |