diff options
author | Menghan Li <menghanli@google.com> | 2020-04-23 13:57:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-23 13:57:45 +0000 |
commit | 6f9f91b67b5a4e9193a70e6e3aeb230ff6fd18a6 (patch) | |
tree | b6988d3cf3c16474421cc016c6811645ca7c2b78 /src/com | |
parent | b6bf10ebbca684e0ab9e709e02f18c31c7703dbb (diff) | |
parent | 771163f0d3cfac4e94e12153d057828e4cdfa916 (diff) | |
download | packages_apps_Settings-6f9f91b67b5a4e9193a70e6e3aeb230ff6fd18a6.tar.gz packages_apps_Settings-6f9f91b67b5a4e9193a70e6e3aeb230ff6fd18a6.tar.bz2 packages_apps_Settings-6f9f91b67b5a4e9193a70e6e3aeb230ff6fd18a6.zip |
Merge "Fix Auto click (dwell timing) the checked option isn't the same as the option before upgrading the OS" into rvc-dev
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java | 11 | ||||
-rw-r--r-- | src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java | 29 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java b/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java index b98a503fe8..47c1ca787d 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java @@ -153,7 +153,7 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if (KEY_DELAY_MODE.equals(key)) { - int delayMillis = getSharedPreferenceForDelayValue(); + final int delayMillis = getSharedPreferenceForDelayValue(); updateCustomDelayValue(delayMillis); } } @@ -172,10 +172,11 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro } private int getSharedPreferenceForDelayValue() { - int delayMillis = mSharedPreferences.getInt(KEY_CUSTOM_DELAY_VALUE, + final int delayMillis = Settings.Secure.getInt(mContentResolver, + Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY, AccessibilityManager.AUTOCLICK_DELAY_DEFAULT); - return delayMillis; + return mSharedPreferences.getInt(KEY_CUSTOM_DELAY_VALUE, delayMillis); } private void putSecureInt(String name, int value) { @@ -190,14 +191,14 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro } private void minusDelayByImageView() { - int delayMillis = getSharedPreferenceForDelayValue(); + final int delayMillis = getSharedPreferenceForDelayValue(); if (delayMillis > MIN_AUTOCLICK_DELAY_MS) { updateCustomDelayValue(delayMillis - AUTOCLICK_DELAY_STEP); } } private void plusDelayByImageView() { - int delayMillis = getSharedPreferenceForDelayValue(); + final int delayMillis = getSharedPreferenceForDelayValue(); if (delayMillis < MAX_AUTOCLICK_DELAY_MS) { updateCustomDelayValue(delayMillis + AUTOCLICK_DELAY_STEP); } diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java index 45cdf913fe..b9af7ce3ee 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java @@ -116,7 +116,7 @@ public class ToggleAutoclickPreferenceController extends BasePreferenceControlle @Override public void onRadioButtonClicked(RadioButtonPreference preference) { - int value = mAccessibilityAutoclickKeyToValueMap.get(mPreferenceKey); + final int value = mAccessibilityAutoclickKeyToValueMap.get(mPreferenceKey); handleRadioButtonPreferenceChange(value); if (mOnChangeListener != null) { mOnChangeListener.onCheckedChanged(mDelayModePref); @@ -137,11 +137,15 @@ public class ToggleAutoclickPreferenceController extends BasePreferenceControlle public void updateState(Preference preference) { super.updateState(preference); - mCurrentUiAutoClickMode = getSharedPreferenceForAutoClickMode(); + final boolean enabled = Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, 0) == 1; + + mCurrentUiAutoClickMode = + enabled ? getSharedPreferenceForAutoClickMode() : AUTOCLICK_OFF_MODE; // Reset RadioButton. mDelayModePref.setChecked(false); - int mode = mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey()); + final int mode = mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey()); updatePreferenceCheckedState(mode); updatePreferenceVisibleState(mode); } @@ -155,10 +159,10 @@ public class ToggleAutoclickPreferenceController extends BasePreferenceControlle } private void setAutoclickModeToKeyMap() { - String[] autoclickKeys = mResources.getStringArray( + final String[] autoclickKeys = mResources.getStringArray( R.array.accessibility_autoclick_control_selector_keys); - int[] autoclickValues = mResources.getIntArray( + final int[] autoclickValues = mResources.getIntArray( R.array.accessibility_autoclick_selector_values); final int autoclickValueCount = autoclickValues.length; @@ -168,19 +172,14 @@ public class ToggleAutoclickPreferenceController extends BasePreferenceControlle } private void handleRadioButtonPreferenceChange(int preference) { - if (preference == AUTOCLICK_OFF_MODE) { - putSecureInt(Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /*value= */ 0); - } else { - putSecureInt(Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /*value= */ 1); - } + putSecureInt(Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, + (preference != AUTOCLICK_OFF_MODE) ? /* enabled */ 1 : /* disabled */ 0); mSharedPreferences.edit().putInt(KEY_DELAY_MODE, preference).apply(); - if (preference == AUTOCLICK_CUSTOM_MODE) { - return; + if (preference != AUTOCLICK_CUSTOM_MODE) { + putSecureInt(CONTROL_AUTOCLICK_DELAY_SECURE, preference); } - - putSecureInt(CONTROL_AUTOCLICK_DELAY_SECURE, preference); } private void putSecureInt(String name, int value) { @@ -188,6 +187,6 @@ public class ToggleAutoclickPreferenceController extends BasePreferenceControlle } private int getSharedPreferenceForAutoClickMode() { - return mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_OFF_MODE); + return mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_CUSTOM_MODE); } } |