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

Commit 9a7dd1c0 authored by jasonwshsu's avatar jasonwshsu
Browse files

Fix error config for accessibility floating menu under multi-users 

Root cause:
1. Write settingsKey / sharedPerference for accessibility floating menu only for main user.
2. Did not update the current ACCESSIBILITY_BUTTON_MODE when switching user.

Solution:
1. Accessibiltiy floating menu will be handled by AccessibilityFloatngMenuController, so it can use correct user conext (createContextAsUser) to handle it.
2. Fetch the latest value ACCESSIBILITY_BUTTON_MODE when needed.

Bug: 184609652
Bug: 191416421
Bug: 191337987
Bug: 191325208
Test: manual test
Merged-In: I4086b3a8b82c461f9368b58d6d390a661dd27f19
Change-Id: I9c657b51012921c08ed5b67291a694c5e5a7ae4a
parent c4bb8a26

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

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.accessibility.floatingmenu; 
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;



import android.content.Context;

import android.os.UserHandle;

import android.text.TextUtils;



import androidx.annotation.MainThread;
@@ -40,11 +41,11 @@ public class AccessibilityFloatingMenuController implements 
        AccessibilityButtonModeObserver.ModeChangedListener,

        AccessibilityButtonTargetsObserver.TargetsChangedListener {



    private final Context mContext;

    private final AccessibilityButtonModeObserver mAccessibilityButtonModeObserver;

    private final AccessibilityButtonTargetsObserver mAccessibilityButtonTargetsObserver;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;



    private Context mContext;

    @VisibleForTesting

    IAccessibilityFloatingMenu mFloatingMenu;

    private int mBtnMode;
@@ -79,6 +80,7 @@ public class AccessibilityFloatingMenuController implements 


        @Override

        public void onUserSwitchComplete(int userId) {

            mContext = mContext.createContextAsUser(UserHandle.of(userId), /* flags= */ 0);

            mBtnMode = mAccessibilityButtonModeObserver.getCurrentAccessibilityButtonMode();

            mBtnTargets =

                    mAccessibilityButtonTargetsObserver.getCurrentAccessibilityButtonTargets();

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+5 −6
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


    private boolean mTransientShown;

    private int mNavBarMode = NAV_BAR_MODE_3BUTTON;

    private int mA11yBtnMode;

    private LightBarController mLightBarController;

    private AutoHideController mAutoHideController;
@@ -487,7 +486,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


        mNavBarMode = mNavigationModeController.addListener(this);

        mAccessibilityButtonModeObserver.addListener(this);

        mA11yBtnMode = mAccessibilityButtonModeObserver.getCurrentAccessibilityButtonMode();

    }



    public NavigationBarView getView() {
@@ -1375,8 +1373,9 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


    private void setAccessibilityFloatingMenuModeIfNeeded() {

        if (QuickStepContract.isGesturalMode(mNavBarMode)) {

            Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,

                    ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);

            Settings.Secure.putIntForUser(mContentResolver,

                    Settings.Secure.ACCESSIBILITY_BUTTON_MODE,

                    ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU, UserHandle.USER_CURRENT);

        }

    }
@@ -1437,7 +1436,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


        // If accessibility button is floating menu mode, click and long click state should be

        // disabled.

        if (mA11yBtnMode == ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU) {

        if (mAccessibilityButtonModeObserver.getCurrentAccessibilityButtonMode()

                == ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU) {

            return 0;

        }
@@ -1546,7 +1546,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


    @Override

    public void onAccessibilityButtonModeChanged(int mode) {

        mA11yBtnMode = mode;

        updateAccessibilityServicesState(mAccessibilityManager);

    }

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

+28 −14
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



import android.content.Context;

import android.content.ContextWrapper;

import android.os.UserHandle;

import android.provider.Settings;

import android.testing.AndroidTestingRunner;
@@ -39,6 +41,7 @@ import com.android.systemui.SysuiTestCase; 
import com.android.systemui.accessibility.AccessibilityButtonModeObserver;

import com.android.systemui.accessibility.AccessibilityButtonTargetsObserver;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -58,6 +61,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 
    @Rule

    public MockitoRule mockito = MockitoJUnit.rule();



    private Context mContextWrapper;

    private KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private AccessibilityFloatingMenuController mController;

    private AccessibilityButtonTargetsObserver mTargetsObserver;
@@ -66,6 +70,16 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 
    private ArgumentCaptor<KeyguardUpdateMonitorCallback> mKeyguardCallbackCaptor;

    private KeyguardUpdateMonitorCallback mKeyguardCallback;



    @Before

    public void setUp() throws Exception {

        mContextWrapper = new ContextWrapper(mContext) {

            @Override

            public Context createContextAsUser(UserHandle user, int flags) {

                return getBaseContext();

            }

        };

    }



    @Test

    public void initController_registerListeners() {

        mController = setUpController();
@@ -105,7 +119,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 
    public void onKeyguardVisibilityChanged_showing_destroyWidget() {

        enableAccessibilityFloatingMenuConfig();

        mController = setUpController();

        mController.mFloatingMenu = new AccessibilityFloatingMenu(mContext);

        mController.mFloatingMenu = new AccessibilityFloatingMenu(mContextWrapper);

        captureKeyguardUpdateMonitorCallback();

        mKeyguardCallback.onUserUnlocked();
@@ -131,7 +145,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 
        final int fakeUserId = 1;

        enableAccessibilityFloatingMenuConfig();

        mController = setUpController();

        mController.mFloatingMenu = new AccessibilityFloatingMenu(mContext);

        mController.mFloatingMenu = new AccessibilityFloatingMenu(mContextWrapper);

        captureKeyguardUpdateMonitorCallback();



        mKeyguardCallback.onUserSwitching(fakeUserId);
@@ -144,7 +158,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 
        final int fakeUserId = 1;

        enableAccessibilityFloatingMenuConfig();

        mController = setUpController();

        mController.mFloatingMenu = new AccessibilityFloatingMenu(mContext);

        mController.mFloatingMenu = new AccessibilityFloatingMenu(mContextWrapper);

        captureKeyguardUpdateMonitorCallback();

        mKeyguardCallback.onUserUnlocked();

        mKeyguardCallback.onKeyguardVisibilityChanged(true);
@@ -172,7 +186,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Test

    public void onAccessibilityButtonModeChanged_floatingModeAndHasButtonTargets_showWidget() {

        Settings.Secure.putStringForUser(mContext.getContentResolver(),

        Settings.Secure.putStringForUser(mContextWrapper.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS,

                UserHandle.USER_CURRENT);

        mController = setUpController();
@@ -184,7 +198,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Test

    public void onAccessibilityButtonModeChanged_floatingModeAndNoButtonTargets_destroyWidget() {

        Settings.Secure.putStringForUser(mContext.getContentResolver(),

        Settings.Secure.putStringForUser(mContextWrapper.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, "", UserHandle.USER_CURRENT);

        mController = setUpController();
@@ -195,7 +209,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Test

    public void onAccessibilityButtonModeChanged_navBarModeAndHasButtonTargets_destroyWidget() {

        Settings.Secure.putStringForUser(mContext.getContentResolver(),

        Settings.Secure.putStringForUser(mContextWrapper.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS,

                UserHandle.USER_CURRENT);

        mController = setUpController();
@@ -207,7 +221,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Test

    public void onAccessibilityButtonModeChanged_navBarModeAndNoButtonTargets_destroyWidget() {

        Settings.Secure.putStringForUser(mContext.getContentResolver(),

        Settings.Secure.putStringForUser(mContextWrapper.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, "", UserHandle.USER_CURRENT);

        mController = setUpController();
@@ -218,7 +232,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Test

    public void onAccessibilityButtonTargetsChanged_floatingModeAndHasButtonTargets_showWidget() {

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

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU,

                UserHandle.USER_CURRENT);

        mController = setUpController();
@@ -230,7 +244,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Test

    public void onAccessibilityButtonTargetsChanged_floatingModeAndNoButtonTargets_destroyWidget() {

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

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU,

                UserHandle.USER_CURRENT);

        mController = setUpController();
@@ -242,7 +256,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Test

    public void onAccessibilityButtonTargetsChanged_navBarModeAndHasButtonTargets_destroyWidget() {

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

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE,

                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR, UserHandle.USER_CURRENT);

        mController = setUpController();
@@ -254,7 +268,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Test

    public void onAccessibilityButtonTargetsChanged_navBarModeAndNoButtonTargets_destroyWidget() {

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

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE,

                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR, UserHandle.USER_CURRENT);

        mController = setUpController();
@@ -269,15 +283,15 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 
        mModeObserver = spy(Dependency.get(AccessibilityButtonModeObserver.class));

        mKeyguardUpdateMonitor = Dependency.get(KeyguardUpdateMonitor.class);



        return new AccessibilityFloatingMenuController(mContext, mTargetsObserver,

        return new AccessibilityFloatingMenuController(mContextWrapper, mTargetsObserver,

                mModeObserver, mKeyguardUpdateMonitor);

    }



    private void enableAccessibilityFloatingMenuConfig() {

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

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU,

                UserHandle.USER_CURRENT);

        Settings.Secure.putStringForUser(mContext.getContentResolver(),

        Settings.Secure.putStringForUser(mContextWrapper.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS,

                UserHandle.USER_CURRENT);

    }