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

Commit 48637844 authored by Danesh Mondegarian's avatar Danesh Mondegarian Committed by Gerrit Code Review
Browse files

Merge "Settings : Update gesture preference check" into cm-10.2

parents 1710a338 f6a43a4b

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

+11 −7
Original line number Diff line number Diff line
@@ -190,17 +190,21 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 
            }

        }



        PreferenceCategory pointerSettingsCategory = (PreferenceCategory)

                        findPreference(KEY_POINTER_SETTINGS_CATEGORY);

        mStylusGestures = (PreferenceScreen) findPreference(KEY_STYLUS_GESTURES);

        mStylusIconEnabled = (CheckBoxPreference) findPreference(KEY_STYLUS_ICON_ENABLED);



        if (pointerSettingsCategory != null) {

            // remove stylus preference for non stylus devices

            if (!getResources().getBoolean(com.android.internal.R.bool.config_stylusGestures)) {

            PreferenceCategory pointerSettingsCategory = (PreferenceCategory)

                    findPreference(KEY_POINTER_SETTINGS_CATEGORY);

            if (pointerSettingsCategory != null) {

                pointerSettingsCategory.removePreference(mStylusGestures);

                pointerSettingsCategory.removePreference(mStylusIconEnabled);

            }

            Utils.updatePreferenceToSpecificActivityFromMetaDataOrRemove(getActivity(),

                            pointerSettingsCategory, KEY_TRACKPAD_SETTINGS);

            if (pointerSettingsCategory.getPreferenceCount() == 0) {

                getPreferenceScreen().removePreference(pointerSettingsCategory);

            }

        }