Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfb07ed7 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Add preference dependency to gesture input related options"

parents 1903b41f 29105a72

java/res/xml/prefs.xml

+2 −0
Original line number Diff line number Diff line
@@ -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" />

java/src/com/android/inputmethod/latin/SettingsFragment.java

+0 −4
Original line number Diff line number Diff line
@@ -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());

        }