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

Commit 977e656e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make a11y shortcut toast appear for all users."

parents bb67b447 7192297b

services/core/java/com/android/server/policy/AccessibilityShortcutController.java

+5 −2
Original line number Diff line number Diff line
@@ -140,8 +140,11 @@ public class AccessibilityShortcutController { 
            String toastMessage = String.format(toastMessageFormatString,

                    serviceInfo.getResolveInfo()

                            .loadLabel(mContext.getPackageManager()).toString());

            mFrameworkObjectProvider.makeToastFromText(mContext, toastMessage, Toast.LENGTH_LONG)

                    .show();

            Toast warningToast = mFrameworkObjectProvider.makeToastFromText(

                    mContext, toastMessage, Toast.LENGTH_LONG);

            warningToast.getWindowParams().privateFlags |=

                    WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;

            warningToast.show();



            mFrameworkObjectProvider.getAccessibilityManagerInstance(mContext)

                    .performAccessibilityShortcut();

services/tests/servicestests/src/com/android/server/policy/AccessibilityShortcutControllerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public class AccessibilityShortcutControllerTest { 
    private @Mock Toast mToast;



    private MockContentResolver mContentResolver;

    private WindowManager.LayoutParams mLayoutParams = new WindowManager.LayoutParams();



    @Before

    public void setUp() throws Exception {
@@ -119,6 +120,9 @@ public class AccessibilityShortcutControllerTest { 
        when(mAlertDialogBuilder.setOnCancelListener(anyObject())).thenReturn(mAlertDialogBuilder);

        when(mAlertDialogBuilder.create()).thenReturn(mAlertDialog);



        mLayoutParams.privateFlags = 0;

        when(mToast.getWindowParams()).thenReturn(mLayoutParams);



        Window window = mock(Window.class);

        Whitebox.setInternalState(window, "mWindowAttributes", new WindowManager.LayoutParams());

        when(mAlertDialog.getWindow()).thenReturn(window);
@@ -183,6 +187,9 @@ public class AccessibilityShortcutControllerTest { 
        accessibilityShortcutController.performAccessibilityShortcut();

        accessibilityShortcutController.performAccessibilityShortcut();

        verify(mToast).show();

        assertEquals(WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS,

                mLayoutParams.privateFlags

                        & WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS);

        verify(mAccessibilityManagerService, times(1)).performAccessibilityShortcut();

    }