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

Commit 054e2502 authored by jasonwshsu's avatar jasonwshsu
Browse files

Handle accessibility floating menu when switching users 

* When switching users completed and keyguard is not show, show accessibility floating menu.

Bug: 184620963
Bug: 173938894
Test: atest AccessibilityFloatingMenuControllerTest AccessibilityButtonModeObserverTest AccessibilityButtonTargetsObserverTest SecureSettingsContentObserverTest
Change-Id: Iad3b9eb3dea1cb0b7828f00f3221f8c6869a7471
parent 96fbf55e

packages/SystemUI/src/com/android/systemui/accessibility/SecureSettingsContentObserver.java

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.database.ContentObserver;

import android.os.Handler;

import android.os.Looper;

import android.os.UserHandle;

import android.provider.Settings;



import androidx.annotation.NonNull;
@@ -75,7 +76,7 @@ public abstract class SecureSettingsContentObserver<T> { 
        if (mListeners.size() == 1) {

            mContentResolver.registerContentObserver(

                    Settings.Secure.getUriFor(mKey), /* notifyForDescendants= */

                    false, mContentObserver);

                    false, mContentObserver, UserHandle.USER_ALL);

        }

    }
@@ -100,7 +101,7 @@ public abstract class SecureSettingsContentObserver<T> { 
     * See {@link Settings.Secure}.

     */

    public final String getSettingsValue() {

        return Settings.Secure.getString(mContentResolver, mKey);

        return Settings.Secure.getStringForUser(mContentResolver, mKey, UserHandle.USER_CURRENT);

    }



    private void updateValueChanged() {

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

+13 −0
Original line number Diff line number Diff line
@@ -71,6 +71,19 @@ public class AccessibilityFloatingMenuController implements 
                handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);

            }

        }



        @Override

        public void onUserSwitching(int userId) {

            destroyFloatingMenu();

        }



        @Override

        public void onUserSwitchComplete(int userId) {

            mBtnMode = mAccessibilityButtonModeObserver.getCurrentAccessibilityButtonMode();

            mBtnTargets =

                    mAccessibilityButtonTargetsObserver.getCurrentAccessibilityButtonTargets();

            handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);

        }

    };



    @Inject

packages/SystemUI/tests/src/com/android/systemui/accessibility/AccessibilityButtonModeObserverTest.java

+12 −8
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;



import android.os.UserHandle;

import android.provider.Settings;

import android.testing.AndroidTestingRunner;
@@ -55,17 +56,18 @@ public class AccessibilityButtonModeObserverTest extends SysuiTestCase { 


    @Before

    public void setUp() {

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

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE,

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR, UserHandle.USER_CURRENT);

        mAccessibilityButtonModeObserver = new AccessibilityButtonModeObserver(mContext);

    }



    @Test

    public void onChange_haveListener_invokeCallback() {

        mAccessibilityButtonModeObserver.addListener(mListener);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, TEST_A11Y_BTN_MODE_VALUE);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, TEST_A11Y_BTN_MODE_VALUE,

                UserHandle.USER_CURRENT);



        mAccessibilityButtonModeObserver.mContentObserver.onChange(false);
@@ -76,8 +78,9 @@ public class AccessibilityButtonModeObserverTest extends SysuiTestCase { 
    public void onChange_noListener_noInvokeCallback() {

        mAccessibilityButtonModeObserver.addListener(mListener);

        mAccessibilityButtonModeObserver.removeListener(mListener);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, TEST_A11Y_BTN_MODE_VALUE);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, TEST_A11Y_BTN_MODE_VALUE,

                UserHandle.USER_CURRENT);



        mAccessibilityButtonModeObserver.mContentObserver.onChange(false);
@@ -86,8 +89,9 @@ public class AccessibilityButtonModeObserverTest extends SysuiTestCase { 


    @Test

    public void getCurrentAccessibilityButtonMode_expectedValue() {

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, TEST_A11Y_BTN_MODE_VALUE);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, TEST_A11Y_BTN_MODE_VALUE,

                UserHandle.USER_CURRENT);



        final int actualValue =

                mAccessibilityButtonModeObserver.getCurrentAccessibilityButtonMode();

packages/SystemUI/tests/src/com/android/systemui/accessibility/AccessibilityButtonTargetsObserverTest.java

+10 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.anyString; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;



import android.os.UserHandle;

import android.provider.Settings;

import android.testing.AndroidTestingRunner;
@@ -60,8 +61,9 @@ public class AccessibilityButtonTargetsObserverTest extends SysuiTestCase { 
    @Test

    public void onChange_haveListener_invokeCallback() {

        mAccessibilityButtonTargetsObserver.addListener(mListener);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS,

                UserHandle.USER_CURRENT);



        mAccessibilityButtonTargetsObserver.mContentObserver.onChange(false);
@@ -72,8 +74,9 @@ public class AccessibilityButtonTargetsObserverTest extends SysuiTestCase { 
    public void onChange_listenerRemoved_noInvokeCallback() {

        mAccessibilityButtonTargetsObserver.addListener(mListener);

        mAccessibilityButtonTargetsObserver.removeListener(mListener);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS,

                UserHandle.USER_CURRENT);



        mAccessibilityButtonTargetsObserver.mContentObserver.onChange(false);
@@ -82,8 +85,9 @@ public class AccessibilityButtonTargetsObserverTest extends SysuiTestCase { 


    @Test

    public void getCurrentAccessibilityButtonTargets_expectedValue() {

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

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, TEST_A11Y_BTN_TARGETS,

                UserHandle.USER_CURRENT);



        final String actualValue =

                mAccessibilityButtonTargetsObserver.getCurrentAccessibilityButtonTargets();

packages/SystemUI/tests/src/com/android/systemui/accessibility/SecureSettingsContentObserverTest.java

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.accessibility; 
import static com.google.common.truth.Truth.assertThat;



import android.content.Context;

import android.os.UserHandle;

import android.provider.Settings;

import android.testing.AndroidTestingRunner;
@@ -55,8 +56,8 @@ public class SecureSettingsContentObserverTest extends SysuiTestCase { 


    @Test

    public void checkValue() {

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, 1);

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, 1, UserHandle.USER_CURRENT);



        assertThat(mTestObserver.getSettingsValue()).isEqualTo("1");

    }