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

Commit b985aa5d authored by Phil Weaver's avatar Phil Weaver Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix clicking the allow/deny button of the dialog was not... 

Merge "Revert "Fix clicking the allow/deny button of the dialog was not working after quickly clicking multiple times.""
parents 08a72979 88bda4c6

core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java

+10 −20
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static com.android.internal.accessibility.util.AccessibilityUtils.isUserS 
import android.annotation.Nullable;

import android.app.Activity;

import android.app.AlertDialog;

import android.content.Context;

import android.content.DialogInterface;

import android.content.res.TypedArray;

import android.os.Bundle;
@@ -103,30 +102,21 @@ public class AccessibilityShortcutChooserActivity extends Activity { 
        final AccessibilityTarget target = mTargets.get(position);



        if ((target instanceof AccessibilityServiceTarget) && !target.isShortcutEnabled()) {

            showPermissionDialogIfNeeded(this, (AccessibilityServiceTarget) target, mTargetAdapter);

            return;

        }



        target.onCheckedChanged(!target.isShortcutEnabled());

        mTargetAdapter.notifyDataSetChanged();

    }



    private void showPermissionDialogIfNeeded(Context context,

            AccessibilityServiceTarget serviceTarget, ShortcutTargetAdapter targetAdapter) {

        if (mPermissionDialog != null) {

            return;

        }



        mPermissionDialog = new AlertDialog.Builder(context)

                .setView(createEnableDialogContentView(context, serviceTarget,

            mPermissionDialog = new AlertDialog.Builder(this)

                    .setView(createEnableDialogContentView(this,

                            (AccessibilityServiceTarget) target,

                            v -> {

                                mPermissionDialog.dismiss();

                            targetAdapter.notifyDataSetChanged();

                                mTargetAdapter.notifyDataSetChanged();

                            },

                            v -> mPermissionDialog.dismiss()))

                .setOnDismissListener(dialog -> mPermissionDialog = null)

                    .create();

            mPermissionDialog.show();

            return;

        }



        target.onCheckedChanged(!target.isShortcutEnabled());

        mTargetAdapter.notifyDataSetChanged();

    }



    private void onDoneButtonClicked() {

core/tests/coretests/AndroidManifest.xml

+0 −4
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ 
    <!-- ChooserActivityTest permissions-->

    <uses-permission android:name="android.permission.SET_CLIP_SOURCE" />



    <!-- AccessibilityShortcutChooserActivityTest permissions -->

    <uses-permission android:name="android.permission.MANAGE_ACCESSIBILITY" />



    <application android:theme="@style/Theme" android:supportsRtl="true">

        <uses-library android:name="android.test.runner" />

        <uses-library android:name="org.apache.http.legacy" android:required="false" />
@@ -1414,7 +1411,6 @@ 
        <activity android:name="com.android.internal.app.ChooserWrapperActivity"/>

        <activity android:name="com.android.internal.app.ResolverWrapperActivity"/>

        <activity android:name="com.android.internal.app.IntentForwarderActivityTest$IntentForwarderWrapperActivity"/>

        <activity android:name="com.android.internal.accessibility.AccessibilityShortcutChooserActivityTest$TestAccessibilityShortcutChooserActivity"/>



        <receiver android:name="android.app.activity.AbortReceiver"

            android:exported="true">

core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutChooserActivityTest.java

deleted100644 → 0
+0 −146
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.accessibility;



import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.click;

import static androidx.test.espresso.action.ViewActions.doubleClick;

import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;

import static androidx.test.espresso.assertion.ViewAssertions.matches;

import static androidx.test.espresso.matcher.RootMatchers.isDialog;

import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;

import static androidx.test.espresso.matcher.ViewMatchers.withId;

import static androidx.test.espresso.matcher.ViewMatchers.withText;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import android.accessibilityservice.AccessibilityServiceInfo;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.os.Bundle;

import android.os.Handler;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.IAccessibilityManager;



import androidx.lifecycle.Lifecycle;

import androidx.test.core.app.ActivityScenario;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.R;

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



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.Collections;



/**

 * Tests for {@link AccessibilityShortcutChooserActivity}.

 */

@RunWith(AndroidJUnit4.class)

public class AccessibilityShortcutChooserActivityTest {

    private static final String TEST_LABEL = "TEST_LABEL";

    private static final Context sContext =

            InstrumentationRegistry.getInstrumentation().getContext();

    private ActivityScenario<TestAccessibilityShortcutChooserActivity> mScenario;

    private static IAccessibilityManager sAccessibilityManagerService;



    @Mock

    private AccessibilityServiceInfo mAccessibilityServiceInfo;



    @Mock

    private ResolveInfo mResolveInfo;



    @Mock

    private ServiceInfo mServiceInfo;



    @Mock

    private ApplicationInfo mApplicationInfo;



    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        sAccessibilityManagerService = mock(IAccessibilityManager.class);



        when(mAccessibilityServiceInfo.getResolveInfo()).thenReturn(mResolveInfo);

        mResolveInfo.serviceInfo = mServiceInfo;

        mServiceInfo.applicationInfo = mApplicationInfo;

        when(mResolveInfo.loadLabel(any(PackageManager.class))).thenReturn(TEST_LABEL);

        when(mAccessibilityServiceInfo.getComponentName()).thenReturn(

                new ComponentName("package", "class"));

        when(sAccessibilityManagerService.getInstalledAccessibilityServiceList(

                anyInt())).thenReturn(Collections.singletonList(mAccessibilityServiceInfo));



        mScenario = ActivityScenario.launch(TestAccessibilityShortcutChooserActivity.class);

    }



    @Test

    public void doubleClickServiceTargetAndClickDenyButton_permissionDialogDoesNotExist() {

        mScenario.moveToState(Lifecycle.State.CREATED);

        mScenario.moveToState(Lifecycle.State.STARTED);

        mScenario.moveToState(Lifecycle.State.RESUMED);

        onView(withText(R.string.accessibility_select_shortcut_menu_title)).inRoot(

                isDialog()).check(matches(isDisplayed()));

        onView(withText(R.string.edit_accessibility_shortcut_menu_button)).perform(click());



        onView(withText(TEST_LABEL)).perform(doubleClick());

        onView(withId(R.id.accessibility_permissionDialog_title)).inRoot(isDialog()).check(

                matches(isDisplayed()));

        onView(withId(R.id.accessibility_permission_enable_deny_button)).inRoot(isDialog()).check(

                matches(isDisplayed()));

        onView(withId(R.id.accessibility_permission_enable_deny_button)).perform(click());



        onView(withId(R.id.accessibility_permissionDialog_title)).inRoot(isDialog()).check(

                doesNotExist());

        mScenario.moveToState(Lifecycle.State.DESTROYED);

    }



    /**

     * Used for testing.

     */

    public static class TestAccessibilityShortcutChooserActivity extends

            AccessibilityShortcutChooserActivity {

        private AccessibilityManager mAccessibilityManager;



        @Override

        protected void onCreate(Bundle savedInstanceState) {

            mAccessibilityManager = new AccessibilityManager(sContext, new Handler(getMainLooper()),

                    sAccessibilityManagerService, /* userId= */ 0, /* serviceConnect= */ true);

            super.onCreate(savedInstanceState);

        }



        @Override

        public Object getSystemService(String name) {

            if (Context.ACCESSIBILITY_SERVICE.equals(name)) {

                return mAccessibilityManager;

            }



            return super.getSystemService(name);

        }

    }

}