diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-17 19:47:03 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 19:47:03 -0700 |
| commit | ed497d24236544e1cf02a385f1f6aa44015eba60 (patch) | |
| tree | df65306f925351553d62097d88a06b5ea22b8d74 /java | |
| parent | d244574be84119505d3712559b743c67a783103c (diff) | |
| parent | 089f1ce95467e279c1d0b9f53de603af6a685bc4 (diff) | |
| download | latinime-ed497d24236544e1cf02a385f1f6aa44015eba60.tar.gz latinime-ed497d24236544e1cf02a385f1f6aa44015eba60.tar.xz latinime-ed497d24236544e1cf02a385f1f6aa44015eba60.zip | |
am 089f1ce9: am bfb07ed7: Merge "Add preference dependency to gesture input related options"
* commit '089f1ce95467e279c1d0b9f53de603af6a685bc4':
Add preference dependency to gesture input related options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/prefs.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsFragment.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index a13021bd0..1581e5fa1 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -93,12 +93,14 @@ <!-- TODO: Move these two options to the advanced settings. --> <CheckBoxPreference android:key="pref_gesture_floating_preview_text" + android:dependency="gesture_input" android:title="@string/gesture_floating_preview_text" android:summary="@string/gesture_floating_preview_text_summary" android:persistent="true" android:defaultValue="true" /> <CheckBoxPreference android:key="pref_gesture_preview_trail" + android:dependency="gesture_input" android:title="@string/gesture_preview_trail" android:persistent="true" android:defaultValue="true" /> diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java index 5405a5eb7..4c729ece8 100644 --- a/java/src/com/android/inputmethod/latin/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java @@ -232,10 +232,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment } else if (key.equals(Settings.PREF_SHOW_LANGUAGE_SWITCH_KEY)) { setPreferenceEnabled(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, Settings.readShowsLanguageSwitchKey(prefs)); - } else if (key.equals(Settings.PREF_GESTURE_INPUT)) { - final boolean gestureInputEnabled = Settings.readGestureInputEnabled(prefs, res); - setPreferenceEnabled(Settings.PREF_GESTURE_PREVIEW_TRAIL, gestureInputEnabled); - setPreferenceEnabled(Settings.PREF_GESTURE_FLOATING_PREVIEW_TEXT, gestureInputEnabled); } else if (key.equals(Settings.PREF_SHOW_SETUP_WIZARD_ICON)) { LauncherIconVisibilityManager.updateSetupWizardIconVisibility(getActivity()); } |