Merge "a11y: Plumb autoclick cursor area size settings to PrefController" into main (83046e7f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/ToggleAutoclickCursorAreaSizeController.java

+20 −10

Original line number	Diff line number	Diff line
		@@ -17,9 +17,14 @@
		package com.android.settings.accessibility;

		import static android.content.Context.MODE_PRIVATE;
		import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_MAX;
		import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_MIN;

		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.SharedPreferences;
		import android.provider.Settings;
		import android.view.accessibility.AccessibilityManager;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		@@ -37,15 +42,14 @@ public class ToggleAutoclickCursorAreaSizeController extends SliderPreferenceCon

		public static final String TAG = ToggleAutoclickCursorAreaSizeController.class.getSimpleName();

		private static final int MIN_SIZE = 20;
		private static final int MAX_SIZE = 100;
		private static final int DEFAULT_SIZE = 60;

		private final ContentResolver mContentResolver;
		private final SharedPreferences mSharedPreferences;

		public ToggleAutoclickCursorAreaSizeController(@NonNull Context context,
		@NonNull String preferenceKey) {
		super(context, preferenceKey);

		mContentResolver = context.getContentResolver();
		mSharedPreferences = context.getSharedPreferences(context.getPackageName(), MODE_PRIVATE);
		}

		@@ -76,28 +80,34 @@ public class ToggleAutoclickCursorAreaSizeController extends SliderPreferenceCon
		@Override
		public void onSharedPreferenceChanged(
		@NonNull SharedPreferences sharedPreferences, @Nullable String key) {
		// TODO(b/383901288): Update slider.
		// TODO(b/383901288): Update slider if interested preference has changed.
		}

		@Override
		public boolean setSliderPosition(int position) {
		// TODO(b/383901288): Update settings.
		Settings.Secure.putInt(mContentResolver,
		Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE, position);
		return true;
		}

		@Override
		public int getSliderPosition() {
		// TODO(b/383901288): retrieve from settings and fallback to default.
		return DEFAULT_SIZE;
		int size = Settings.Secure.getInt(mContentResolver,
		Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE,
		AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_DEFAULT);
		// Make sure the size is between min and max allowed value.
		size = Math.min(size, AUTOCLICK_CURSOR_AREA_SIZE_MAX);
		size = Math.max(size, AUTOCLICK_CURSOR_AREA_SIZE_MIN);
		return size;
		}

		@Override
		public int getMax() {
		return MAX_SIZE;
		return AUTOCLICK_CURSOR_AREA_SIZE_MAX;
		}

		@Override
		public int getMin() {
		return MIN_SIZE;
		return AUTOCLICK_CURSOR_AREA_SIZE_MIN;
		}
		}

tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickCursorAreaSizeControllerTest.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -29,11 +29,15 @@ import android.content.SharedPreferences;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.provider.Settings;
		import android.view.accessibility.AccessibilityManager;

		import androidx.test.core.app.ApplicationProvider;

		import com.android.settings.core.BasePreferenceController;

		import com.google.common.collect.ImmutableList;

		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		@@ -100,4 +104,23 @@ public class ToggleAutoclickCursorAreaSizeControllerTest {

		verify(prefs).unregisterOnSharedPreferenceChangeListener(controller);
		}

		@Test
		public void getProgress_matchesSetting() {
		assertThat(mController.getSliderPosition()).isEqualTo(readSetting());
		}

		@Test
		public void setProgress_updatesSetting() {
		for (int size : ImmutableList.of(20, 40, 60, 80, 100)) {
		mController.setSliderPosition(size);
		assertThat(readSetting()).isEqualTo(size);
		}
		}

		private int readSetting() {
		return Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE,
		AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_DEFAULT);
		}
		}