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

Commit bc56b57f authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge "Unable to drag and edit the Accessibility shortcut" into main

parents 394313cc 2e004eb0

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

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ class MenuViewLayer extends FrameLayout implements 
        List<ResolveInfo> activities = packageManager.queryIntentActivities(intent,

                PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY));

        if (!activities.isEmpty()) {

            mContext.startActivity(intent);

            mContext.startActivityAsUser(intent, UserHandle.CURRENT);

            mStatusBarManager.collapsePanels();

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ public class MenuViewLayerTest extends SysuiTestCase { 
        mockActivityQuery(true);

        mMenuViewLayer.dispatchAccessibilityAction(R.id.action_edit);

        ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);

        verify(mSpyContext).startActivity(intentCaptor.capture());

        verify(mSpyContext).startActivityAsUser(intentCaptor.capture(), eq(UserHandle.CURRENT));

        assertThat(intentCaptor.getValue().getAction()).isEqualTo(

                mMenuViewLayer.getIntentForEditScreen().getAction());

    }
@@ -299,6 +299,7 @@ public class MenuViewLayerTest extends SysuiTestCase { 
        mockActivityQuery(false);

        mMenuViewLayer.dispatchAccessibilityAction(R.id.action_edit);

        verify(mSpyContext, never()).startActivity(any());

        verify(mSpyContext, never()).startActivityAsUser(any(), any());

    }



    @Test