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

Commit ad9b260c authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge changes Iad3b9eb3,I052a5729 into sc-dev am: c2c81446 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14683434

Change-Id: Ief0f724d73b46ac2707749294d6ef69e10d267d7
parents 5806e6ff c2c81446

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

+71 −34
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATIN 


import android.content.Context;

import android.text.TextUtils;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.MainThread;



import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.systemui.accessibility.AccessibilityButtonModeObserver;

import com.android.systemui.accessibility.AccessibilityButtonModeObserver.AccessibilityButtonMode;

import com.android.systemui.accessibility.AccessibilityButtonTargetsObserver;
@@ -37,41 +38,65 @@ import javax.inject.Inject; 
@SysUISingleton

public class AccessibilityFloatingMenuController implements

        AccessibilityButtonModeObserver.ModeChangedListener,

        AccessibilityButtonTargetsObserver.TargetsChangedListener,

        AccessibilityManager.AccessibilityStateChangeListener {

        AccessibilityButtonTargetsObserver.TargetsChangedListener {



    private final Context mContext;

    private final AccessibilityManager mAccessibilityManager;

    private final AccessibilityButtonModeObserver mAccessibilityButtonModeObserver;

    private final AccessibilityButtonTargetsObserver mAccessibilityButtonTargetsObserver;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;



    @VisibleForTesting

    IAccessibilityFloatingMenu mFloatingMenu;

    private int mBtnMode;

    private String mBtnTargets;

    private boolean mIsKeyguardVisible;

    private boolean mIsAccessibilityManagerServiceReady;



    @VisibleForTesting

    final KeyguardUpdateMonitorCallback mKeyguardCallback = new KeyguardUpdateMonitorCallback() {

        // Accessibility floating menu needs to retrieve information from

        // AccessibilityManagerService, and it would be ready before onUserUnlocked().

        @Override

        public void onUserUnlocked() {

            mIsAccessibilityManagerServiceReady = true;

            handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);

        }



        // Keyguard state would be changed before AccessibilityManagerService is ready to retrieve,

        // need to wait until receive onUserUnlocked().

        @Override

        public void onKeyguardVisibilityChanged(boolean showing) {

            mIsKeyguardVisible = showing;

            if (mIsAccessibilityManagerServiceReady) {

                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

    public AccessibilityFloatingMenuController(Context context,

            AccessibilityButtonTargetsObserver accessibilityButtonTargetsObserver,

            AccessibilityButtonModeObserver accessibilityButtonModeObserver) {

            AccessibilityButtonModeObserver accessibilityButtonModeObserver,

            KeyguardUpdateMonitor keyguardUpdateMonitor) {

        mContext = context;

        mAccessibilityButtonTargetsObserver = accessibilityButtonTargetsObserver;

        mAccessibilityButtonModeObserver = accessibilityButtonModeObserver;

        mAccessibilityManager = mContext.getSystemService(AccessibilityManager.class);



        mAccessibilityButtonModeObserver.addListener(this);

        mAccessibilityButtonTargetsObserver.addListener(this);

        mBtnMode = mAccessibilityButtonModeObserver.getCurrentAccessibilityButtonMode();

        mBtnTargets = mAccessibilityButtonTargetsObserver.getCurrentAccessibilityButtonTargets();

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;



        // Accessibility floating menu widget needs accessibility service to work, but system

        // accessibility might be unavailable during the phone get booted, hence it needs to wait

        // for accessibility manager callback to work.

        mAccessibilityManager.addAccessibilityStateChangeListener(this);

        if (mAccessibilityManager.isEnabled()) {

            handleFloatingMenuVisibility(mBtnMode, mBtnTargets);

            mAccessibilityManager.removeAccessibilityStateChangeListener(this);

        }

        init();

    }



    /**
@@ -82,7 +107,7 @@ public class AccessibilityFloatingMenuController implements 
    @Override

    public void onAccessibilityButtonModeChanged(@AccessibilityButtonMode int mode) {

        mBtnMode = mode;

        handleFloatingMenuVisibility(mBtnMode, mBtnTargets);

        handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);

    }



    /**
@@ -94,27 +119,39 @@ public class AccessibilityFloatingMenuController implements 
    @Override

    public void onAccessibilityButtonTargetsChanged(String targets) {

        mBtnTargets = targets;

        handleFloatingMenuVisibility(mBtnMode, mBtnTargets);

        handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);

    }



    private void init() {

        mIsKeyguardVisible = false;

        mIsAccessibilityManagerServiceReady = false;

        mBtnMode = mAccessibilityButtonModeObserver.getCurrentAccessibilityButtonMode();

        mBtnTargets = mAccessibilityButtonTargetsObserver.getCurrentAccessibilityButtonTargets();

        registerContentObservers();

    }



    private void registerContentObservers() {

        mAccessibilityButtonModeObserver.addListener(this);

        mAccessibilityButtonTargetsObserver.addListener(this);

        mKeyguardUpdateMonitor.registerCallback(mKeyguardCallback);

    }



    /**

     * Handles visibility of the accessibility floating menu when system accessibility state

     * changes.

     * If system accessibility become available onAccessibilityStateChanged(true), then we don't

     * need to listen to this listener anymore.

     * Handles the accessibility floating menu visibility with the given values.

     *

     * @param enabled Whether accessibility is enabled.

     * @param keyguardVisible the keyguard visibility status. Not show the

     *                        {@link AccessibilityFloatingMenu} when keyguard appears.

     * @param mode accessibility button mode {@link AccessibilityButtonMode}

     * @param targets accessibility button list; it should comes from

     *                {@link android.provider.Settings.Secure#ACCESSIBILITY_BUTTON_TARGETS}.

     */

    @Override

    public void onAccessibilityStateChanged(boolean enabled) {

        if (enabled) {

            handleFloatingMenuVisibility(mBtnMode, mBtnTargets);

        }



        mAccessibilityManager.removeAccessibilityStateChangeListener(this);

    private void handleFloatingMenuVisibility(boolean keyguardVisible,

            @AccessibilityButtonMode int mode, String targets) {

        if (keyguardVisible) {

            destroyFloatingMenu();

            return;

        }



    private void handleFloatingMenuVisibility(@AccessibilityButtonMode int mode, String targets) {

        if (shouldShowFloatingMenu(mode, targets)) {

            showFloatingMenu();

        } else {

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+4 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.logging.UiEventLogger;

import com.android.internal.util.NotificationMessagingUtil;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.ViewMediatorCallback;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.systemui.Prefs;
@@ -263,9 +264,10 @@ public class DependencyProvider { 
    @SysUISingleton

    public AccessibilityFloatingMenuController provideAccessibilityFloatingMenuController(

            Context context, AccessibilityButtonTargetsObserver accessibilityButtonTargetsObserver,

            AccessibilityButtonModeObserver accessibilityButtonModeObserver) {

            AccessibilityButtonModeObserver accessibilityButtonModeObserver,

            KeyguardUpdateMonitor keyguardUpdateMonitor) {

        return new AccessibilityFloatingMenuController(context, accessibilityButtonTargetsObserver,

                accessibilityButtonModeObserver);

                accessibilityButtonModeObserver, keyguardUpdateMonitor);

    }



    /** */

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();