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

Commit da405e98 authored by Yuhan Yang's avatar Yuhan Yang
Browse files

Observe RevertToLeftClick setting in autoclick controller 

Observe revertToLeftClick setting changes in autoclick controller.
If revertToLeftClick is true, revert autoclick back to leftclick
after performing an autoclick action when autoclick type is
not leftClick. Also reset autoclick panel state.

Bug: 388845719
Test: AutoclickControllerTest
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: Ie651c8e2b6b889ba4ccdf882b84bee15661dd97c
parent ab6525c9

services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java

+47 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.view.MotionEvent.BUTTON_SECONDARY; 
import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_DEFAULT;

import static android.view.accessibility.AccessibilityManager.AUTOCLICK_DELAY_DEFAULT;

import static android.view.accessibility.AccessibilityManager.AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT_DEFAULT;

import static android.view.accessibility.AccessibilityManager.AUTOCLICK_REVERT_TO_LEFT_CLICK_DEFAULT;



import static com.android.server.accessibility.autoclick.AutoclickIndicatorView.SHOW_INDICATOR_DELAY_TIME;

import static com.android.server.accessibility.autoclick.AutoclickTypePanel.AUTOCLICK_TYPE_LEFT_CLICK;
@@ -159,7 +160,8 @@ public class AutoclickController extends BaseEventStreamTransformation { 
                    initiateAutoclickIndicator(handler);

                }



                mClickScheduler = new ClickScheduler(handler, AUTOCLICK_DELAY_DEFAULT);

                mClickScheduler = new ClickScheduler(

                            handler, AUTOCLICK_DELAY_DEFAULT);

                mAutoclickSettingsObserver = new AutoclickSettingsObserver(mUserId, handler);

                mAutoclickSettingsObserver.start(

                        mContext.getContentResolver(),
@@ -304,6 +306,10 @@ public class AutoclickController extends BaseEventStreamTransformation { 
                Settings.Secure.getUriFor(

                        Settings.Secure.ACCESSIBILITY_AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT);



        private final Uri mAutoclickRevertToLeftClickSettingUri =

                Settings.Secure.getUriFor(

                        Settings.Secure.ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK);



        private ContentResolver mContentResolver;

        private ClickScheduler mClickScheduler;

        private AutoclickIndicatorScheduler mAutoclickIndicatorScheduler;
@@ -368,6 +374,13 @@ public class AutoclickController extends BaseEventStreamTransformation { 
                        /* observer= */ this,

                        mUserId);

                onChange(/* selfChange= */ true, mAutoclickIgnoreMinorCursorMovementSettingUri);



                mContentResolver.registerContentObserver(

                        mAutoclickRevertToLeftClickSettingUri,

                        /* notifyForDescendants= */ false,

                        /* observer= */ this,

                        mUserId);

                onChange(/* selfChange= */ true, mAutoclickRevertToLeftClickSettingUri);

            }

        }
@@ -424,6 +437,20 @@ public class AutoclickController extends BaseEventStreamTransformation { 
                            == AccessibilityUtils.State.ON;

                    mClickScheduler.setIgnoreMinorCursorMovement(ignoreMinorCursorMovement);

                }



                if (mAutoclickRevertToLeftClickSettingUri.equals(uri)) {

                    boolean revertToLeftClick =

                            Settings.Secure.getIntForUser(

                                    mContentResolver,

                                    Settings.Secure

                                            .ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK,

                                    AUTOCLICK_REVERT_TO_LEFT_CLICK_DEFAULT

                                            ? AccessibilityUtils.State.ON

                                            : AccessibilityUtils.State.OFF,

                                    mUserId)

                            == AccessibilityUtils.State.ON;

                    mClickScheduler.setRevertToLeftClick(revertToLeftClick);

                }

            }

        }

    }
@@ -505,6 +532,9 @@ public class AutoclickController extends BaseEventStreamTransformation { 
        /** Whether the minor cursor movement should be ignored. */

        private boolean mIgnoreMinorCursorMovement = AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT_DEFAULT;



        /** Whether the autoclick type reverts to left click once performing an action. */

        private boolean mRevertToLeftClick = AUTOCLICK_REVERT_TO_LEFT_CLICK_DEFAULT;



        /** Whether there is pending click. */

        private boolean mActive;

        /** If active, time at which pending click is scheduled. */
@@ -555,6 +585,7 @@ public class AutoclickController extends BaseEventStreamTransformation { 


            sendClick();

            resetInternalState();

            resetSelectedClickTypeIfNecessary();

        }



        /**
@@ -633,6 +664,11 @@ public class AutoclickController extends BaseEventStreamTransformation { 
            return mDelay;

        }



        @VisibleForTesting

        boolean getRevertToLeftClickForTesting() {

            return mRevertToLeftClick;

        }



        /**

         * Updates the time at which click sequence should occur.

         *
@@ -692,6 +728,12 @@ public class AutoclickController extends BaseEventStreamTransformation { 
            }

        }



        private void resetSelectedClickTypeIfNecessary() {

            if (mRevertToLeftClick && mActiveClickType != AUTOCLICK_TYPE_LEFT_CLICK) {

                mAutoclickTypePanel.resetSelectedClickType();

            }

        }



        /**

         * @param event Observed motion event.

         * @return Whether the event coords are far enough from the anchor for the event not to be
@@ -716,6 +758,10 @@ public class AutoclickController extends BaseEventStreamTransformation { 
            mIgnoreMinorCursorMovement = ignoreMinorCursorMovement;

        }



        public void setRevertToLeftClick(boolean revertToLeftClick) {

            mRevertToLeftClick = revertToLeftClick;

        }



        private void updateMovementSlop(double slop) {

            mMovementSlop = slop;

        }

services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickTypePanel.java

+5 −1
Original line number Diff line number Diff line
@@ -283,7 +283,11 @@ public class AutoclickTypePanel { 
        // The pause button calls `togglePause()` directly so it does not need extra logic.

        mPauseButton.setOnClickListener(v -> togglePause());



        // Initializes panel as collapsed state and only displays the left click button.

        resetSelectedClickType();

    }



    /** Reset panel as collapsed state and only displays the left click button. */

    public void resetSelectedClickType() {

        hideAllClickTypeButtons();

        mLeftClickButton.setVisibility(View.VISIBLE);

        setSelectedClickType(AUTOCLICK_TYPE_LEFT_CLICK);

services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java

+26 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.accessibility.autoclick; 


import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;



import static com.android.server.accessibility.autoclick.AutoclickTypePanel.AUTOCLICK_TYPE_RIGHT_CLICK;

import static com.android.server.testutils.MockitoUtilsKt.eq;



import static com.google.common.truth.Truth.assertThat;
@@ -545,6 +546,29 @@ public class AutoclickControllerTest { 
        assertThat(mController.mClickScheduler.getIsActiveForTesting()).isFalse();

    }



    @Test

    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)

    public void triggerRightClickWithRevertToLeftClickEnabled_resetClickType() {

        // Move mouse to initialize autoclick panel.

        injectFakeMouseActionHoverMoveEvent();



        AutoclickTypePanel mockAutoclickTypePanel = mock(AutoclickTypePanel.class);

        mController.mAutoclickTypePanel = mockAutoclickTypePanel;

        mController.clickPanelController.handleAutoclickTypeChange(AUTOCLICK_TYPE_RIGHT_CLICK);



        // Set ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK to true.

        Settings.Secure.putIntForUser(mTestableContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK,

                AccessibilityUtils.State.ON,

                mTestableContext.getUserId());

        mController.onChangeForTesting(/* selfChange= */ true,

                Settings.Secure.getUriFor(

                        Settings.Secure.ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK));

        when(mockAutoclickTypePanel.isPaused()).thenReturn(false);

        mController.mClickScheduler.run();

        assertThat(mController.mClickScheduler.getRevertToLeftClickForTesting()).isTrue();

    }



    @Test

    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)

    public void pauseButton_flagOn_clickNotTriggeredWhenPaused() {
@@ -766,6 +790,8 @@ public class AutoclickControllerTest { 
        // Set click type to right click.

        mController.clickPanelController.handleAutoclickTypeChange(

                AutoclickTypePanel.AUTOCLICK_TYPE_RIGHT_CLICK);

        AutoclickTypePanel mockAutoclickTypePanel = mock(AutoclickTypePanel.class);

        mController.mAutoclickTypePanel = mockAutoclickTypePanel;



        // Send hover move event.

        MotionEvent hoverMove = MotionEvent.obtain(