From d683d1813275ce86d5b64367bd42744c179dbafc Mon Sep 17 00:00:00 2001
From: Wenyu Zhang <zhangwenyu@google.com>
Date: Mon, 13 Jan 2025 21:31:03 +0000
Subject: [PATCH] a11y: Add "Ignore minor cursor movement" autoclick setting

When "Ignore minor cursor movement" is on, the small cursor movement
within the cursor area ring will not interrupt the autoclick timer.

Screenshot: http://b/388845718#comment2

Change-Id: Ib6a8ca8463358a3e2de5ae6be8afd5113a5826ba
Test: ToggleAutoclickIgnoreMinorCursorMovementControllerTest
Bug: b/388845718
Flag: com.android.server.accessibility.enable_autoclick_indicator
---
 res/values/strings.xml                        |  3 +
 res/xml/accessibility_autoclick_settings.xml  |  5 ++
 ...ckIgnoreMinorCursorMovementController.java | 58 ++++++++++++++++
 ...noreMinorCursorMovementControllerTest.java | 69 +++++++++++++++++++
 4 files changed, 135 insertions(+)
 create mode 100644 src/com/android/settings/accessibility/ToggleAutoclickIgnoreMinorCursorMovementController.java
 create mode 100644 tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickIgnoreMinorCursorMovementControllerTest.java

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 236959d2530..dc9d0c44f56 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5594,6 +5594,9 @@
     <!-- Summary for the seekbar that adjust auto click cursor area size. [CHAR_LIMIT=NONE] -->
     <!-- TODO(b/383901288): 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>
+    <!-- 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>
     <!-- Title for preference screen for configuring vibrations. [CHAR LIMIT=NONE] -->
     <string name="accessibility_vibration_settings_title">Vibration &amp; haptics</string>
     <!-- Summary for preference screen for configuring vibrations. [CHAR LIMIT=NONE] -->
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index d3a951479ad..edcc29bdf9c 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -84,6 +84,11 @@
         settings:searchable="false"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickCursorAreaSizeController"/>
 
+    <SwitchPreferenceCompat
+        android:key="accessibility_control_autoclick_ignore_minor_cursor_movement"
+        android:title="@string/autoclick_ignore_minor_cursor_movement_title"
+        settings:controller="com.android.settings.accessibility.ToggleAutoclickIgnoreMinorCursorMovementController"/>
+
     <com.android.settings.accessibility.AccessibilityFooterPreference
         android:key="accessibility_autoclick_footer"
         android:title="@string/accessibility_autoclick_description"
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickIgnoreMinorCursorMovementController.java b/src/com/android/settings/accessibility/ToggleAutoclickIgnoreMinorCursorMovementController.java
new file mode 100644
index 00000000000..302e42a2b2f
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleAutoclickIgnoreMinorCursorMovementController.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.server.accessibility.Flags;
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+public class ToggleAutoclickIgnoreMinorCursorMovementController extends TogglePreferenceController {
+
+    private static final String TAG =
+            ToggleAutoclickIgnoreMinorCursorMovementController.class.getSimpleName();
+
+    public ToggleAutoclickIgnoreMinorCursorMovementController(
+            @NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Flags.enableAutoclickIndicator() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        // TODO(b/388845718): retrieve check status from settings.
+        return false;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        // TODO(b/388845718): Update settings.
+        return true;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_accessibility;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickIgnoreMinorCursorMovementControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickIgnoreMinorCursorMovementControllerTest.java
new file mode 100644
index 00000000000..889b7322888
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickIgnoreMinorCursorMovementControllerTest.java
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link ToggleAutoclickIgnoreMinorCursorMovementController}. */
+@RunWith(RobolectricTestRunner.class)
+public class ToggleAutoclickIgnoreMinorCursorMovementControllerTest {
+
+    private static final String PREFERENCE_KEY =
+            "accessibility_control_autoclick_ignore_minor_cursor_movement";
+
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    private ToggleAutoclickIgnoreMinorCursorMovementController mController;
+
+    @Before
+    public void setUp() {
+        mController =
+                new ToggleAutoclickIgnoreMinorCursorMovementController(mContext, PREFERENCE_KEY);
+    }
+
+    @Test
+    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
+    public void getAvailabilityStatus_availableWhenFlagOn() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
+    public void getAvailabilityStatus_conditionallyUnavailableWhenFlagOn() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+}