Merge "Add Autoclick cursor area size settings dialog" into main

res/layout/dialog_autoclick_cursor_area_size.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2025 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/autoclick_cursor_area_size_dialog_title"
+        android:text="@string/autoclick_cursor_area_size_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginHorizontal="26dp"
+        android:textSize="20sp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
+    />
+
+    <TextView
+        android:id="@+id/autoclick_cursor_area_size_dialog_subtitle"
+        android:text="@string/autoclick_cursor_area_size_summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="26dp"
+        android:layout_marginTop="8dp"
+        android:textSize="16sp"
+        android:textColor="?android:attr/textColorSecondary"
+    />
+
+    <RadioGroup
+        android:id="@+id/autoclick_cursor_area_size_value_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="16dp">
+
+        <RadioButton
+            android:id="@+id/autoclick_cursor_area_size_value_extra_small"
+            android:text="@string/autoclick_cursor_area_size_dialog_option_extra_small"
+            style="@style/AutoclickDialogRadioButton"/>
+        <RadioButton
+            android:id="@+id/autoclick_cursor_area_size_value_small"
+            android:text="@string/autoclick_cursor_area_size_dialog_option_small"
+            style="@style/AutoclickDialogRadioButton"/>
+        <RadioButton
+            android:id="@+id/autoclick_cursor_area_size_value_default"
+            android:text="@string/autoclick_cursor_area_size_dialog_option_default"
+            style="@style/AutoclickDialogRadioButton"/>
+
+        <RadioButton
+            android:id="@+id/autoclick_cursor_area_size_value_large"
+            android:text="@string/autoclick_cursor_area_size_dialog_option_large"
+            style="@style/AutoclickDialogRadioButton"/>
+
+        <RadioButton
+            android:id="@+id/autoclick_cursor_area_size_value_extra_large"
+            android:text="@string/autoclick_cursor_area_size_dialog_option_extra_large"
+            style="@style/AutoclickDialogRadioButton"/>
+    </RadioGroup>
+
+</LinearLayout>

res/values/strings.xml

@@ -5643,12 +5643,27 @@
     <string name="accessibility_autoclick_longer_desc">Longer</string>
     <!-- Description for the seekbar that adjust auto click time. [CHAR_LIMIT=NONE] -->
     <string name="accessibility_autoclick_seekbar_desc">Auto click time</string>
-    <!-- Title for the seekbar that adjust auto click cursor area size. [CHAR_LIMIT=NONE] -->
+    <!-- Title for the alert dialog that adjust auto click cursor area size. [CHAR_LIMIT=NONE] -->
-    <!-- TODO(b/383901288): Update string to translatable once approved by UXW. -->
+    <!-- TODO(b/394683600): Update string to translatable once approved by UXW. -->
-    <string name="autoclick_cursor_area_size_title" translatable="false">Cursor area size</string>
+    <string name="autoclick_cursor_area_size_title" translatable="false">Click area</string>
-    <!-- Summary for the seekbar that adjust auto click cursor area size. [CHAR_LIMIT=NONE] -->
+    <!-- Summary for the alert dialog that adjust auto click cursor area size. [CHAR_LIMIT=NONE] -->
-    <!-- TODO(b/383901288): Update string to translatable once approved by UXW. -->
+    <!-- TODO(b/394683600): Update string to translatable once approved by UXW. -->
-    <string name="autoclick_cursor_area_size_summary" translatable="false">Adjust the autoclick ring indicator area size</string>
+    <string name="autoclick_cursor_area_size_summary" translatable="false">The area where the cursor can move freely without canceling the click once the countdown starts</string>
+    <!-- Option for the autoclick area dialog that adjust auto click cursor area size to extra large. [CHAR_LIMIT=NONE] -->
+    <!-- TODO(b/394683600): Update string to translatable once approved by UXW. -->
+    <string name="autoclick_cursor_area_size_dialog_option_extra_large" translatable="false">Extra large</string>
+    <!-- Option for the autoclick area dialog that adjust auto click cursor area size to large. [CHAR_LIMIT=NONE] -->
+    <!-- TODO(b/394683600): Update string to translatable once approved by UXW. -->
+    <string name="autoclick_cursor_area_size_dialog_option_large" translatable="false">Large</string>
+    <!-- Option for the autoclick area dialog that adjust auto click cursor area size to Medium(Default). [CHAR_LIMIT=NONE] -->
+    <!-- TODO(b/394683600): Update string to translatable once approved by UXW. -->
+    <string name="autoclick_cursor_area_size_dialog_option_default" translatable="false">Default</string>
+    <!-- Option for the autoclick area dialog that adjust auto click cursor area size to small. [CHAR_LIMIT=NONE] -->
+    <!-- TODO(b/394683600): Update string to translatable once approved by UXW. -->
+    <string name="autoclick_cursor_area_size_dialog_option_small" translatable="false">Small</string>
+    <!-- Option for the autoclick area dialog that adjust auto click cursor area size to extra small. [CHAR_LIMIT=NONE] -->
+    <!-- TODO(b/394683600): Update string to translatable once approved by UXW. -->
+    <string name="autoclick_cursor_area_size_dialog_option_extra_small" translatable="false">Extra small</string>
     <!-- Title for the toggle button that turns on/off the autoclick setting of ignoring minor cursor movement. [CHAR_LIMIT=NONE] -->
     <!-- TODO(b/388845718): Update string to translatable once approved by UXW. -->
     <string name="autoclick_ignore_minor_cursor_movement_title" translatable="false">Ignore minor cursor movement</string>

res/values/styles.xml

@@ -710,6 +710,14 @@
         <item name="android:textSize">14sp</item>
     </style>
 
+    <style name="AutoclickDialogRadioButton">
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
+        <item name="android:background">@null</item>
+    </style>
+
     <style name="Widget.PopupWindow.Settings"
            parent="@android:style/Widget.DeviceDefault.PopupWindow">
         <item name="android:clipToPadding">true</item>

res/xml/accessibility_autoclick_settings.xml

@@ -76,12 +76,11 @@
         settings:searchable="false"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickCustomSeekbarController"/>
 
-    <com.android.settingslib.widget.SliderPreference
+    <Preference
         android:key="accessibility_control_autoclick_cursor_area_size"
-        android:title="@string/autoclick_cursor_area_size_title"
+        android:persistent="false"
-        android:summary="@string/autoclick_cursor_area_size_summary"
-        android:selectable="false"
         settings:searchable="false"
+        android:title="@string/autoclick_cursor_area_size_title"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickCursorAreaSizeController" />
 
     <SwitchPreferenceCompat

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

@@ -17,7 +17,6 @@
 package com.android.settings.accessibility;
 
 import static android.content.Context.MODE_PRIVATE;
-import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_INCREMENT_SIZE;
 import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_MAX;
 import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_MIN;
 
@@ -25,35 +24,49 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.view.accessibility.AccessibilityManager;
+import android.widget.RadioGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
-import androidx.preference.PreferenceScreen;
+import androidx.preference.Preference;
 
 import com.android.server.accessibility.Flags;
-import com.android.settings.core.SliderPreferenceController;
+import com.android.settings.R;
-import com.android.settingslib.widget.SliderPreference;
+import com.android.settings.core.BasePreferenceController;
+
+import com.google.common.collect.ImmutableBiMap;
 
 /** Controller class that controls accessibility autoclick cursor area size settings. */
-public class ToggleAutoclickCursorAreaSizeController extends SliderPreferenceController
+public class ToggleAutoclickCursorAreaSizeController extends BasePreferenceController
         implements LifecycleObserver, SharedPreferences.OnSharedPreferenceChangeListener {
 
     public static final String TAG = ToggleAutoclickCursorAreaSizeController.class.getSimpleName();
 
+    public final ImmutableBiMap<Integer, Integer> RADIO_BUTTON_ID_TO_CURSOR_SIZE =
+            new ImmutableBiMap.Builder<Integer, Integer>()
+                .put(R.id.autoclick_cursor_area_size_value_extra_large, 100)
+                .put(R.id.autoclick_cursor_area_size_value_large, 80)
+                .put(R.id.autoclick_cursor_area_size_value_default, 60)
+                .put(R.id.autoclick_cursor_area_size_value_small, 40)
+                .put(R.id.autoclick_cursor_area_size_value_extra_small, 20)
+                .buildOrThrow();
+
     private final ContentResolver mContentResolver;
     private final SharedPreferences mSharedPreferences;
-    private SliderPreference mPreference;
+    protected AlertDialog mAlertDialog;
 
     public ToggleAutoclickCursorAreaSizeController(@NonNull Context context,
             @NonNull String preferenceKey) {
         super(context, preferenceKey);
-
         mContentResolver = context.getContentResolver();
         mSharedPreferences = context.getSharedPreferences(context.getPackageName(), MODE_PRIVATE);
+        constructDialog(context);
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
@@ -70,16 +83,49 @@ public class ToggleAutoclickCursorAreaSizeController extends SliderPreferenceCon
         }
     }
 
-    @Override
+    protected void constructDialog(Context context) {
-    public void displayPreference(@NonNull PreferenceScreen screen) {
+        mAlertDialog = new AlertDialog.Builder(context)
-        super.displayPreference(screen);
+                .setView(R.layout.dialog_autoclick_cursor_area_size)
-        mPreference = screen.findPreference(getPreferenceKey());
+                .setPositiveButton(android.R.string.ok,
-        if (mPreference != null) {
+                        (dialog, which) -> {
-            mPreference.setMin(getMin());
+                            RadioGroup radioGroup =
-            mPreference.setMax(getMax());
+                                    mAlertDialog.findViewById(
-            mPreference.setSliderIncrement(AUTOCLICK_CURSOR_AREA_INCREMENT_SIZE);
+                                            R.id.autoclick_cursor_area_size_value_group);
-            mPreference.setValue(getSliderPosition());
+                            int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
+                            int size = RADIO_BUTTON_ID_TO_CURSOR_SIZE.get(checkedRadioButtonId);
+                            updateAutoclickCursorAreaSize(size);
+                        })
+                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+                .create();
+        mAlertDialog.setOnShowListener(dialog -> {
+            initStateBasedOnSize();
+        });
     }
+
+    private void initStateBasedOnSize() {
+        RadioGroup cannedValueRadioGroup = mAlertDialog.findViewById(
+                    R.id.autoclick_cursor_area_size_value_group);
+        int autoclickCursordefaultSize = validateSize(Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE,
+                AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_DEFAULT));
+
+        int radioButtonId = RADIO_BUTTON_ID_TO_CURSOR_SIZE.inverse()
+                .get(autoclickCursordefaultSize);
+
+        cannedValueRadioGroup.check(radioButtonId);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+
+        if (mAlertDialog != null) {
+            mAlertDialog.show();
+        }
+
+        return true;
     }
 
     @Override
@@ -93,30 +139,12 @@ public class ToggleAutoclickCursorAreaSizeController extends SliderPreferenceCon
         // TODO(b/383901288): Update slider if interested preference has changed.
     }
 
-    @Override
+    /** Updates autoclick cursor area size. */
-    public boolean setSliderPosition(int position) {
+    public void updateAutoclickCursorAreaSize(int size) {
-        int size = validateSize(position);
         Settings.Secure.putInt(
-                mContentResolver, Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE, size);
+                mContentResolver,
-        return true;
-    }
-
-    @Override
-    public int getSliderPosition() {
-        int size = Settings.Secure.getInt(mContentResolver,
                 Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE,
-                AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_DEFAULT);
+                validateSize(size));
-        return validateSize(size);
-    }
-
-    @Override
-    public int getMax() {
-        return AUTOCLICK_CURSOR_AREA_SIZE_MAX;
-    }
-
-    @Override
-    public int getMin() {
-        return AUTOCLICK_CURSOR_AREA_SIZE_MIN;
     }
 
     private int validateSize(int size) {

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

@@ -16,55 +16,60 @@
 
 package com.android.settings.accessibility;
 
-import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_MAX;
-import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_MIN;
-
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.when;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.kotlin.VerificationKt.verify;
 
 import android.content.Context;
-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 android.widget.RadioGroup;
 
-import androidx.preference.PreferenceScreen;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.widget.SliderPreference;
+import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-
-import com.google.common.collect.ImmutableList;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLooper;
 
 /** Tests for {@link ToggleAutoclickCursorAreaSizeController}. */
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        com.android.settings.testutils.shadow.ShadowFragment.class,
+        ShadowAlertDialogCompat.class,
+})
 public class ToggleAutoclickCursorAreaSizeControllerTest {
 
     private static final String PREFERENCE_KEY = "accessibility_control_autoclick_cursor_area_size";
-    private static final String PACKAGE = "package";
 
     @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
+    @Mock
+    private Preference mPreference;
+    private Context mContext;
     private ToggleAutoclickCursorAreaSizeController mController;
 
     @Before
     public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
+
+        when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
         mController = new ToggleAutoclickCursorAreaSizeController(mContext, PREFERENCE_KEY);
     }
 
@@ -83,90 +88,48 @@ public class ToggleAutoclickCursorAreaSizeControllerTest {
     }
 
     @Test
-    public void onStart_registerOnSharedPreferenceChangeListener() {
+    public void handlePreferenceTreeClick_dialogShows() {
-        final SharedPreferences prefs = mock(SharedPreferences.class);
+        mController.handlePreferenceTreeClick(mPreference);
-        final Context context = mock(Context.class);
-        doReturn(PACKAGE).when(context).getPackageName();
-        doReturn(prefs).when(context).getSharedPreferences(anyString(), anyInt());
-        final ToggleAutoclickCursorAreaSizeController controller =
-                new ToggleAutoclickCursorAreaSizeController(context, PREFERENCE_KEY);
 
-        controller.onStart();
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
 
-        verify(prefs).registerOnSharedPreferenceChangeListener(controller);
+        assertThat(alertDialog.isShowing()).isTrue();
-    }
-
-    @Test
-    public void onStop_unregisterOnSharedPreferenceChangeListener() {
-        final SharedPreferences prefs = mock(SharedPreferences.class);
-        final Context context = mock(Context.class);
-        doReturn(PACKAGE).when(context).getPackageName();
-        doReturn(prefs).when(context).getSharedPreferences(anyString(), anyInt());
-        final ToggleAutoclickCursorAreaSizeController controller =
-                new ToggleAutoclickCursorAreaSizeController(context, PREFERENCE_KEY);
-
-        controller.onStop();
-
-        verify(prefs).unregisterOnSharedPreferenceChangeListener(controller);
     }
 
     @Test
+    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
     public void getProgress_matchesSetting_inRangeValue() {
-        // TODO(388844952): Use parameter testing.
+        updateSetting(mController.RADIO_BUTTON_ID_TO_CURSOR_SIZE.get(
-        for (int size : ImmutableList.of(20, 40, 60, 80, 100)) {
+                R.id.autoclick_cursor_area_size_value_extra_large));
-            updateSetting(size);
+        ShadowLooper.idleMainLooper();
+        mController.handlePreferenceTreeClick(mPreference);
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        RadioGroup radioGroup =  alertDialog.findViewById(
+                    R.id.autoclick_cursor_area_size_value_group);
+        ShadowLooper.idleMainLooper();
 
-            assertThat(mController.getSliderPosition()).isEqualTo(size);
+        assertThat(radioGroup.getCheckedRadioButtonId())
-        }
+                .isEqualTo(R.id.autoclick_cursor_area_size_value_extra_large);
-    }
-
-    @Test
-    public void getProgress_matchesSetting_aboveMaxValue() {
-        updateSetting(120);
-
-        assertThat(mController.getSliderPosition()).isEqualTo(AUTOCLICK_CURSOR_AREA_SIZE_MAX);
-    }
-
-    @Test
-    public void getProgress_matchesSetting_belowMinValue() {
-        updateSetting(0);
-
-        assertThat(mController.getSliderPosition()).isEqualTo(AUTOCLICK_CURSOR_AREA_SIZE_MIN);
     }
 
     @Test
     public void setProgress_updatesSetting_inRangeValue() {
-        // TODO(388844952): Use parameter testing.
+        mController.handlePreferenceTreeClick(mPreference);
-        for (int position : ImmutableList.of(20, 40, 60, 80, 100)) {
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
-            mController.setSliderPosition(position);
+        RadioGroup radioGroup =  alertDialog.findViewById(
+                    R.id.autoclick_cursor_area_size_value_group);
+        ShadowLooper.idleMainLooper();
+        radioGroup.check(R.id.autoclick_cursor_area_size_value_extra_large);
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+        ShadowLooper.idleMainLooper();
+        assertThat(readSetting()).isEqualTo(100);
 
-            assertThat(readSetting()).isEqualTo(position);
+        mController.handlePreferenceTreeClick(mPreference);
-        }
+        ShadowLooper.idleMainLooper();
-    }
+        radioGroup.check(R.id.autoclick_cursor_area_size_value_extra_small);
-
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
-    @Test
+        ShadowLooper.idleMainLooper();
-    public void setProgress_updatesSetting_aboveMaxValue() {
+        assertThat(readSetting()).isEqualTo(20);
-        mController.setSliderPosition(120);
-
-        assertThat(readSetting()).isEqualTo(AUTOCLICK_CURSOR_AREA_SIZE_MAX);
-    }
-
-    @Test
-    public void setProgress_updatesSetting_belowMinValue() {
-        mController.setSliderPosition(0);
-
-        assertThat(readSetting()).isEqualTo(AUTOCLICK_CURSOR_AREA_SIZE_MIN);
-    }
-
-    @Test
-    public void sliderPreference_setCorrectInitialValue() {
-        SliderPreference preference = mock(SliderPreference.class);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-        doReturn(preference).when(screen).findPreference(anyString());
-
-        mController.displayPreference(screen);
-
-        verify(preference).setValue(mController.getSliderPosition());
     }
 
     private int readSetting() {