nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 089f1ce9: am bfb07ed7: Merge "Add preference dependency to gesture input related options" 

* commit '089f1ce95467e279c1d0b9f53de603af6a685bc4':
  Add preference dependency to gesture input related options
main
Tadashi G. Takaoka 2013-04-17 19:47:03 -07:00 committed by Android Git Automerger
parent d244574be8 089f1ce954
commit ed497d2423
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/xml/prefs.xml
View File

@ -93,12 +93,14 @@
<!-- TODO: Move these two options to the advanced settings. --> <!-- TODO: Move these two options to the advanced settings. -->
<CheckBoxPreference <CheckBoxPreference
android:key="pref_gesture_floating_preview_text" android:key="pref_gesture_floating_preview_text"
android:dependency="gesture_input"
android:title="@string/gesture_floating_preview_text" android:title="@string/gesture_floating_preview_text"
android:summary="@string/gesture_floating_preview_text_summary" android:summary="@string/gesture_floating_preview_text_summary"
android:persistent="true" android:persistent="true"
android:defaultValue="true" /> android:defaultValue="true" />
<CheckBoxPreference <CheckBoxPreference
android:key="pref_gesture_preview_trail" android:key="pref_gesture_preview_trail"
android:dependency="gesture_input"
android:title="@string/gesture_preview_trail" android:title="@string/gesture_preview_trail"
android:persistent="true" android:persistent="true"
android:defaultValue="true" /> android:defaultValue="true" />

4
java/src/com/android/inputmethod/latin/SettingsFragment.java
View File

@ -232,10 +232,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment
} else if (key.equals(Settings.PREF_SHOW_LANGUAGE_SWITCH_KEY)) { } else if (key.equals(Settings.PREF_SHOW_LANGUAGE_SWITCH_KEY)) {
setPreferenceEnabled(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, setPreferenceEnabled(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST,
Settings.readShowsLanguageSwitchKey(prefs)); 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)) { } else if (key.equals(Settings.PREF_SHOW_SETUP_WIZARD_ICON)) {
LauncherIconVisibilityManager.updateSetupWizardIconVisibility(getActivity()); LauncherIconVisibilityManager.updateSetupWizardIconVisibility(getActivity());
} }