diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-15 06:15:36 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 06:15:36 +0000 |
| commit | bfb07ed7d66c014ea35c3ac9f339b526e7d64815 (patch) | |
| tree | 88680c7413f7b65eff533b796a723bb1f556ccc8 /java | |
| parent | 1903b41ffd42cd90c8fe71ee32bbe1fe556b8167 (diff) | |
| parent | 29105a725de0f1aeab5159f955da8a9875054701 (diff) | |
| download | latinime-bfb07ed7d66c014ea35c3ac9f339b526e7d64815.tar.gz latinime-bfb07ed7d66c014ea35c3ac9f339b526e7d64815.tar.xz latinime-bfb07ed7d66c014ea35c3ac9f339b526e7d64815.zip | |
Merge "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()); } |