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

Commit 816b5703 authored by Peter Liang's avatar Peter Liang
Browse files

Fix that accessibility shortcuts still turned but FM disappeared on the screen... 

Fix that accessibility shortcuts still turned but FM disappeared on the screen in owner mode after switching user.

Root cause:
Accessibility manager service seems to be not ready.

Actions:
Add the service callbacks to avoid getting wrong shortcut data.

Bug: 258320314
Test: atest MenuInfoRepositoryTest
Change-Id: Ib37b1fbd7964974bf5eb6791b25e95f180fa9f7a
parent b6861f44

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

+22 −6
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.text.TextUtils;

import android.util.Log;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.NonNull;
@@ -71,6 +72,9 @@ class MenuInfoRepository { 


    private final Context mContext;

    private final Configuration mConfiguration;

    private final AccessibilityManager mAccessibilityManager;

    private final AccessibilityManager.AccessibilityServicesStateChangeListener

            mA11yServicesStateChangeListener = manager -> onTargetFeaturesChanged();

    private final Handler mHandler = new Handler(Looper.getMainLooper());

    private final OnSettingsContentsChanged mSettingsContentsCallback;

    private Position mPercentagePosition;
@@ -85,12 +89,12 @@ class MenuInfoRepository { 
        int ENABLED = 1;

    }



    private final ContentObserver mMenuTargetFeaturesContentObserver =

    @VisibleForTesting

    final ContentObserver mMenuTargetFeaturesContentObserver =

            new ContentObserver(mHandler) {

                @Override

                public void onChange(boolean selfChange) {

                    mSettingsContentsCallback.onTargetFeaturesChanged(

                            getTargets(mContext, ACCESSIBILITY_BUTTON));

                    onTargetFeaturesChanged();

                }

            };
@@ -125,8 +129,7 @@ class MenuInfoRepository { 
            }



            if ((diff & ActivityInfo.CONFIG_LOCALE) != 0) {

                mSettingsContentsCallback.onTargetFeaturesChanged(

                        getTargets(mContext, ACCESSIBILITY_BUTTON));

                onTargetFeaturesChanged();

            }



            mConfiguration.setTo(newConfig);
@@ -138,8 +141,10 @@ class MenuInfoRepository { 
        }

    };



    MenuInfoRepository(Context context, OnSettingsContentsChanged settingsContentsChanged) {

    MenuInfoRepository(Context context, AccessibilityManager accessibilityManager,

            OnSettingsContentsChanged settingsContentsChanged) {

        mContext = context;

        mAccessibilityManager = accessibilityManager;

        mConfiguration = new Configuration(context.getResources().getConfiguration());

        mSettingsContentsCallback = settingsContentsChanged;
@@ -209,6 +214,11 @@ class MenuInfoRepository { 
                UserHandle.USER_CURRENT);

    }



    private void onTargetFeaturesChanged() {

        mSettingsContentsCallback.onTargetFeaturesChanged(

                getTargets(mContext, ACCESSIBILITY_BUTTON));

    }



    private Position getStartPosition() {

        final String absolutePositionString = Prefs.getString(mContext,

                Prefs.Key.ACCESSIBILITY_FLOATING_MENU_POSITION, /* defaultValue= */ null);
@@ -240,6 +250,9 @@ class MenuInfoRepository { 
                /* notifyForDescendants */ false, mMenuFadeOutContentObserver,

                UserHandle.USER_CURRENT);

        mContext.registerComponentCallbacks(mComponentCallbacks);



        mAccessibilityManager.addAccessibilityServicesStateChangeListener(

                mA11yServicesStateChangeListener);

    }



    void unregisterObserversAndCallbacks() {
@@ -247,6 +260,9 @@ class MenuInfoRepository { 
        mContext.getContentResolver().unregisterContentObserver(mMenuSizeContentObserver);

        mContext.getContentResolver().unregisterContentObserver(mMenuFadeOutContentObserver);

        mContext.unregisterComponentCallbacks(mComponentCallbacks);



        mAccessibilityManager.removeAccessibilityServicesStateChangeListener(

                mA11yServicesStateChangeListener);

    }



    interface OnSettingsContentsChanged {

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

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class MenuViewLayer extends FrameLayout implements 
        mAccessibilityManager = accessibilityManager;

        mFloatingMenu = floatingMenu;



        mMenuViewModel = new MenuViewModel(context);

        mMenuViewModel = new MenuViewModel(context, accessibilityManager);

        mMenuViewAppearance = new MenuViewAppearance(context, windowManager);

        mMenuView = new MenuView(context, mMenuViewModel, mMenuViewAppearance);

        mMenuAnimationController = mMenuView.getMenuAnimationController();

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

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.accessibility.floatingmenu;



import android.content.Context;

import android.view.accessibility.AccessibilityManager;



import androidx.lifecycle.LiveData;

import androidx.lifecycle.MutableLiveData;
@@ -41,8 +42,9 @@ class MenuViewModel implements MenuInfoRepository.OnSettingsContentsChanged { 
    private final MutableLiveData<Position> mPercentagePositionData = new MutableLiveData<>();

    private final MenuInfoRepository mInfoRepository;



    MenuViewModel(Context context) {

        mInfoRepository = new MenuInfoRepository(context, /* settingsContentsChanged= */ this);

    MenuViewModel(Context context, AccessibilityManager accessibilityManager) {

        mInfoRepository = new MenuInfoRepository(context,

                accessibilityManager, /* settingsContentsChanged= */ this);

    }



    @Override

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

+12 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify; 
import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;



import androidx.test.filters.SmallTest;
@@ -29,8 +30,12 @@ import com.android.systemui.SysuiTestCase; 
import com.android.wm.shell.bubbles.DismissView;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



/** Tests for {@link DismissAnimationController}. */

@SmallTest
@@ -40,10 +45,16 @@ public class DismissAnimationControllerTest extends SysuiTestCase { 
    private DismissAnimationController mDismissAnimationController;

    private DismissView mDismissView;



    @Rule

    public MockitoRule mockito = MockitoJUnit.rule();



    @Mock

    private AccessibilityManager mAccessibilityManager;



    @Before

    public void setUp() throws Exception {

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

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext);

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager);

        final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,

                stubWindowManager);

        final MenuView stubMenuView = new MenuView(mContext, stubMenuViewModel,

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

+12 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.testing.TestableLooper; 
import android.view.View;

import android.view.ViewPropertyAnimator;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;



import androidx.dynamicanimation.animation.DynamicAnimation;

import androidx.dynamicanimation.animation.FlingAnimation;
@@ -43,9 +44,13 @@ import com.android.systemui.SysuiTestCase; 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.Optional;
@@ -61,12 +66,18 @@ public class MenuAnimationControllerTest extends SysuiTestCase { 
    private MenuView mMenuView;

    private TestMenuAnimationController mMenuAnimationController;



    @Rule

    public MockitoRule mockito = MockitoJUnit.rule();



    @Mock

    private AccessibilityManager mAccessibilityManager;



    @Before

    public void setUp() throws Exception {

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

        final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,

                stubWindowManager);

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext);

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager);



        mMenuView = spy(new MenuView(mContext, stubMenuViewModel, stubMenuViewAppearance));

        mViewPropertyAnimator = spy(mMenuView.animate());