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

Commit 251709c3 authored by Menghan Li's avatar Menghan Li Committed by Automerger Merge Worker
Browse files

Merge "Check target is empty before showing it in AccessibilityFloatingMenu"... 

Merge "Check target is empty before showing it in AccessibilityFloatingMenu" into tm-dev am: fc5c5e9a am: a1bc6f04

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



Change-Id: Ie820ae2aa7d57dc0bfca913985fbd38daeacf5b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7ea1715 a1bc6f04

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

+8 −1
Original line number Diff line number Diff line
@@ -39,10 +39,13 @@ import android.text.TextUtils; 


import androidx.annotation.NonNull;



import com.android.internal.accessibility.dialog.AccessibilityTarget;

import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.Prefs;

import com.android.systemui.shared.system.SysUiStatsLog;



import java.util.List;



/**

 * Contains logic for an accessibility floating menu view.

 */
@@ -120,9 +123,13 @@ public class AccessibilityFloatingMenu implements IAccessibilityFloatingMenu { 
        if (isShowing()) {

            return;

        }

        final List<AccessibilityTarget> targetList = getTargets(mContext, ACCESSIBILITY_BUTTON);

        if (targetList.isEmpty()) {

            return;

        }



        mMenuView.show();

        mMenuView.onTargetsChanged(getTargets(mContext, ACCESSIBILITY_BUTTON));

        mMenuView.onTargetsChanged(targetList);

        mMenuView.updateOpacityWith(isFadeEffectEnabled(mContext),

                getOpacityValue(mContext));

        mMenuView.setSizeType(getSizeType(mContext));

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

+11 −0
Original line number Diff line number Diff line
@@ -87,6 +87,17 @@ public class AccessibilityFloatingMenuTest extends SysuiTestCase { 
        assertThat(mMenuView.isShowing()).isFalse();

    }



    @Test

    public void showMenuView_emptyTarget_notShow() {

        final List<String> emptyTargets = new ArrayList<>();

        doReturn(emptyTargets).when(mAccessibilityManager).getAccessibilityShortcutTargets(

                anyInt());



        mMenu.show();



        assertThat(mMenuView.isShowing()).isFalse();

    }



    @After

    public void tearDown() {

        mMenu.hide();