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

Commit 8243697d authored by Riley Jones's avatar Riley Jones
Browse files

Fix to further ensure floating menu is refreshed on user change 

Destroys an existing floating menu so that a new one is always generated on user initialization.

Test: atest AccessibilityFloatingMenuControllerTest
Flag: EXEMPT small internal change
Bug: 371107453
Change-Id: I8bff93d6d2cf91b44a1694f0c8ce1a2572a285de
parent e0dbf7e2

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java

+5 −1
Original line number Diff line number Diff line
@@ -226,7 +226,11 @@ public class AccessibilityFloatingMenuController implements 
            mBtnTargets =

                    mAccessibilityButtonTargetsObserver.getCurrentAccessibilityButtonTargets();

            mHandler.post(

                    () -> handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets));

                    () -> {

                        // Force a refresh by destroying the menu if it exists.

                        destroyFloatingMenu();

                        handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);

                    });

        }

    }

}

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuControllerTest.java

+19 −0
Original line number Diff line number Diff line
@@ -338,6 +338,25 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 
        assertThat(mController.mFloatingMenu).isInstanceOf(MenuViewLayerController.class);

    }



    @Test

    public void onUserInitializationComplete_destroysOldWidget() {

        enableAccessibilityFloatingMenuConfig();

        mController = setUpController();



        captureKeyguardUpdateMonitorCallback();

        mKeyguardCallback.onUserUnlocked();

        mKeyguardCallback.onKeyguardVisibilityChanged(false);



        IAccessibilityFloatingMenu floatingMenu = mController.mFloatingMenu;



        mController.mUserInitializationCompleteCallback

                .onUserInitializationComplete(mContext.getUserId());

        mTestableLooper.processAllMessages();



        assertThat(mController.mFloatingMenu).isNotNull();

        assertThat(mController.mFloatingMenu).isNotSameInstanceAs(floatingMenu);

    }



    private AccessibilityFloatingMenuController setUpController() {

        final WindowManager windowManager = mContext.getSystemService(WindowManager.class);

        final ViewCaptureAwareWindowManager viewCaptureAwareWindowManager =