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

Commit b80f25dd authored by Longbo Wei's avatar Longbo Wei
Browse files

autoclick: Handle scroll panel theme change 

Video: http://shortn/_5hu6aeQY6N

Bug: b/431038033
Test: atest
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: I6f0e0018fc8b5654c58056af304fb964272c29c6
parent 29f29ff9

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

+3 −1
Original line number Diff line number Diff line
@@ -662,7 +662,6 @@ public class AutoclickController extends BaseEventStreamTransformation implement 


    @Override

    public void onConfigurationChanged(@NonNull Configuration newConfig) {

        // TODO(b/431038033): Add a similar onConfigurationChanged to AutoclickScrollPanel.

        // When system configuration is changed, update the indicator view

        // and type panel configuration.

        if (mAutoclickIndicatorView != null) {
@@ -671,6 +670,9 @@ public class AutoclickController extends BaseEventStreamTransformation implement 
        if (mAutoclickTypePanel != null) {

            mAutoclickTypePanel.onConfigurationChanged(newConfig);

        }

        if (mAutoclickScrollPanel != null) {

            mAutoclickScrollPanel.onConfigurationChanged(newConfig);

        }

    }



    @Override

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

+38 −8
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M 


import android.annotation.IntDef;

import android.content.Context;

import android.content.res.Configuration;

import android.graphics.BlendMode;

import android.graphics.BlendModeColorFilter;

import android.graphics.Color;
@@ -77,18 +78,18 @@ public class AutoclickScrollPanel { 
    public @interface ScrollDirection {}



    private final Context mContext;

    private final AutoclickLinearLayout mContentView;

    private AutoclickLinearLayout mContentView;

    private final WindowManager mWindowManager;

    private final WindowManager.LayoutParams mParams;

    private ScrollPanelControllerInterface mScrollPanelController;

    private final AutoclickScrollPointIndicator mAutoclickScrollPointIndicator;



    // Scroll panel buttons.

    private final ImageButton mUpButton;

    private final ImageButton mDownButton;

    private final ImageButton mLeftButton;

    private final ImageButton mRightButton;

    private final ImageButton mExitButton;

    private ImageButton mUpButton;

    private ImageButton mDownButton;

    private ImageButton mLeftButton;

    private ImageButton mRightButton;

    private ImageButton mExitButton;



    private final int mStatusBarHeight;
@@ -122,11 +123,17 @@ public class AutoclickScrollPanel { 
        mWindowManager = windowManager;

        mScrollPanelController = controller;

        mAutoclickScrollPointIndicator = new AutoclickScrollPointIndicator(context);

        mContentView = (AutoclickLinearLayout) LayoutInflater.from(context).inflate(

                R.layout.accessibility_autoclick_scroll_panel, null);

        mParams = getDefaultLayoutParams();

        mStatusBarHeight = SystemBarUtils.getStatusBarHeight(context);



        inflateViewAndResources();

    }



    private void inflateViewAndResources() {

        // Inflate the panel layout.

        mContentView = (AutoclickLinearLayout) LayoutInflater.from(mContext).inflate(

                R.layout.accessibility_autoclick_scroll_panel, null);



        // Initialize buttons.

        mUpButton = mContentView.findViewById(R.id.scroll_up);

        mLeftButton = mContentView.findViewById(R.id.scroll_left);
@@ -308,6 +315,29 @@ public class AutoclickScrollPanel { 
        }

    }



    /**

     * Updates the autoclick scroll panel when the system configuration is changed.

     * @param newConfig The new system configuration.

     */

    public void onConfigurationChanged(@android.annotation.NonNull Configuration newConfig) {

        mContext.getMainThreadHandler().post(() -> {

            // Only remove the view if it's currently shown.

            if (mInScrollMode) {

                mWindowManager.removeView(mContentView);

            }



            // Always re-inflate the views and resources to adopt the new configuration.

            // This is important even if the panel is hidden.

            inflateViewAndResources();



            // If the panel was shown before the configuration change, add the newly

            // inflated view back to the window to restore its state.

            if (mInScrollMode) {

                mWindowManager.addView(mContentView, mParams);

            }

        });

    }



    /**

     * Retrieves the layout params for AutoclickScrollPanel, used when it's added to the Window

     * Manager.

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

+17 −0
Original line number Diff line number Diff line
@@ -1620,6 +1620,23 @@ public class AutoclickControllerTest { 
        verify(spyTypePanel).onConfigurationChanged(newConfig);

    }



    @Test

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

    public void onConfigurationChanged_notifiesScrollPanelToUpdateTheme() throws Exception {

        injectFakeMouseActionHoverMoveEvent();



        // Create a spy on the real object to verify method calls.

        AutoclickScrollPanel spyScrollPanel = spy(mController.mAutoclickScrollPanel);

        mController.mAutoclickScrollPanel = spyScrollPanel;



        // Simulate a theme change.

        Configuration newConfig = new Configuration();

        mController.onConfigurationChanged(newConfig);



        // Verify onConfigurationChanged was called.

        verify(spyScrollPanel).onConfigurationChanged(newConfig);

    }



    @Test

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

    public void onInputDeviceChanged_disconnectAndReconnect_hidesAndShowsTypePanel() {