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

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

Merge "Replace ShortcutType with UserShortcutType to reduce duplicate declaration." into main

parents 635ede2a 692deace

core/java/android/view/accessibility/AccessibilityManager.java

+3 −48
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ import android.view.accessibility.AccessibilityEvent.EventType; 


import com.android.internal.R;

import com.android.internal.accessibility.common.ShortcutConstants;

import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IntPair;
@@ -161,22 +160,6 @@ public final class AccessibilityManager { 
    public static final String ACTION_CHOOSE_ACCESSIBILITY_BUTTON =

            "com.android.internal.intent.action.CHOOSE_ACCESSIBILITY_BUTTON";



    /**

     * Used as an int value for accessibility chooser activity to represent the accessibility button

     * shortcut type.

     *

     * @hide

     */

    public static final int ACCESSIBILITY_BUTTON = 0;



    /**

     * Used as an int value for accessibility chooser activity to represent hardware key shortcut,

     * such as volume key button.

     *

     * @hide

     */

    public static final int ACCESSIBILITY_SHORTCUT_KEY = 1;



    /** @hide */

    public static final int FLASH_REASON_CALL = 1;
@@ -189,35 +172,6 @@ public final class AccessibilityManager { 
    /** @hide */

    public static final int FLASH_REASON_PREVIEW = 4;



    /**

     * Annotations for the shortcut type.

     * <p>Note: Keep in sync with {@link #SHORTCUT_TYPES}.</p>

     * @hide

     */

    // TODO(b/323686675): reuse the one defined in ShortcutConstants

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(value = {

            // LINT.IfChange(shortcut_type_intdef)

            ACCESSIBILITY_BUTTON,

            ACCESSIBILITY_SHORTCUT_KEY,

            UserShortcutType.QUICK_SETTINGS,

            // LINT.ThenChange(:shortcut_type_array)

    })

    public @interface ShortcutType {}



    /**

     * Used for iterating through {@link ShortcutType}.

     * <p>Note: Keep in sync with {@link ShortcutType}.</p>

     * @hide

     */

    public static final int[] SHORTCUT_TYPES = {

            // LINT.IfChange(shortcut_type_array)

            ACCESSIBILITY_BUTTON,

            ACCESSIBILITY_SHORTCUT_KEY,

            UserShortcutType.QUICK_SETTINGS,

            // LINT.ThenChange(:shortcut_type_intdef)

    };



    /**

     * Annotations for content flag of UI.

     * @hide
@@ -1648,7 +1602,7 @@ public final class AccessibilityManager { 
     */

    @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY)

    public void enableShortcutsForTargets(boolean enable,

            @UserShortcutType int shortcutTypes, @NonNull Set<String> targets,

            @ShortcutConstants.UserShortcutType int shortcutTypes, @NonNull Set<String> targets,

            @UserIdInt int userId) {

        final IAccessibilityManager service;

        synchronized (mLock) {
@@ -1862,7 +1816,8 @@ public final class AccessibilityManager { 
    @TestApi

    @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY)

    @NonNull

    public List<String> getAccessibilityShortcutTargets(@ShortcutType int shortcutType) {

    public List<String> getAccessibilityShortcutTargets(

            @ShortcutConstants.UserShortcutType int shortcutType) {

        final IAccessibilityManager service;

        synchronized (mLock) {

            service = getServiceLocked();

core/java/com/android/internal/accessibility/AccessibilityShortcutController.java

+4 −5
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.internal.accessibility; 


import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_ALL_MASK;

import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG;

import static android.view.accessibility.AccessibilityManager.ACCESSIBILITY_SHORTCUT_KEY;



import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;

import static com.android.internal.accessibility.dialog.AccessibilityTargetHelper.getTargets;

import static com.android.internal.os.RoSystemProperties.SUPPORT_ONE_HANDED_MODE;

import static com.android.internal.util.ArrayUtils.convertToLongArray;
@@ -57,7 +57,6 @@ import android.view.accessibility.Flags; 
import android.widget.Toast;



import com.android.internal.R;

import com.android.internal.accessibility.common.ShortcutConstants;

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

import com.android.internal.accessibility.util.ShortcutUtils;

import com.android.internal.util.function.pooled.PooledLambda;
@@ -331,7 +330,7 @@ public class AccessibilityShortcutController { 
    }



    private AlertDialog createShortcutWarningDialog(int userId) {

        List<AccessibilityTarget> targets = getTargets(mContext, ACCESSIBILITY_SHORTCUT_KEY);

        List<AccessibilityTarget> targets = getTargets(mContext, HARDWARE);

        if (targets.size() == 0) {

            return null;

        }
@@ -374,7 +373,7 @@ public class AccessibilityShortcutController { 
                                Set<String> targetServices =

                                        ShortcutUtils.getShortcutTargetsFromSettings(

                                                mContext,

                                                ShortcutConstants.UserShortcutType.HARDWARE,

                                                HARDWARE,

                                                userId);



                                Settings.Secure.putStringForUser(mContext.getContentResolver(),
@@ -543,7 +542,7 @@ public class AccessibilityShortcutController { 
    private ComponentName getShortcutTargetComponentName() {

        final List<String> shortcutTargets = mFrameworkObjectProvider

                .getAccessibilityManagerInstance(mContext)

                .getAccessibilityShortcutTargets(ACCESSIBILITY_SHORTCUT_KEY);

                .getAccessibilityShortcutTargets(HARDWARE);

        if (shortcutTargets.size() != 1) {

            return null;

        }

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

+3 −4
Original line number Diff line number Diff line
@@ -17,23 +17,22 @@ 
package com.android.internal.accessibility.dialog;



import static com.android.internal.accessibility.util.ShortcutUtils.convertToKey;

import static com.android.internal.accessibility.util.ShortcutUtils.convertToUserType;

import static com.android.internal.accessibility.util.ShortcutUtils.isShortcutContained;



import android.accessibilityservice.AccessibilityShortcutInfo;

import android.annotation.NonNull;

import android.content.Context;

import android.view.accessibility.AccessibilityManager.ShortcutType;



import com.android.internal.accessibility.common.ShortcutConstants.AccessibilityFragmentType;

import com.android.internal.accessibility.common.ShortcutConstants.ShortcutMenuMode;

import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;



/**

 * Base class for creating accessibility activity target.

 */

class AccessibilityActivityTarget extends AccessibilityTarget {



    AccessibilityActivityTarget(Context context, @ShortcutType int shortcutType,

    AccessibilityActivityTarget(Context context, @UserShortcutType int shortcutType,

            @NonNull AccessibilityShortcutInfo shortcutInfo) {

        super(context,

                shortcutType,
@@ -44,7 +43,7 @@ class AccessibilityActivityTarget extends AccessibilityTarget { 
                shortcutInfo.getActivityInfo().applicationInfo.uid,

                shortcutInfo.getActivityInfo().loadLabel(context.getPackageManager()),

                shortcutInfo.getActivityInfo().loadIcon(context.getPackageManager()),

                convertToKey(convertToUserType(shortcutType)));

                convertToKey(shortcutType));

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
package com.android.internal.accessibility.dialog;



import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;

import static android.view.accessibility.AccessibilityManager.ACCESSIBILITY_BUTTON;



import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;

import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;

import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;

import static com.android.internal.accessibility.dialog.AccessibilityTargetHelper.getTargets;

import static com.android.internal.accessibility.util.AccessibilityStatsLogUtils.logAccessibilityButtonLongPressStatus;
@@ -85,7 +85,7 @@ public class AccessibilityButtonChooserActivity extends Activity { 
            prompt.setVisibility(View.VISIBLE);

        }



        mTargets.addAll(getTargets(this, ACCESSIBILITY_BUTTON));

        mTargets.addAll(getTargets(this, SOFTWARE));



        final GridView gridview = findViewById(R.id.accessibility_button_chooser_grid);

        gridview.setAdapter(new ButtonTargetAdapter(mTargets));

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

+3 −4
Original line number Diff line number Diff line
@@ -17,16 +17,15 @@ 
package com.android.internal.accessibility.dialog;



import static com.android.internal.accessibility.util.ShortcutUtils.convertToKey;

import static com.android.internal.accessibility.util.ShortcutUtils.convertToUserType;

import static com.android.internal.accessibility.util.ShortcutUtils.isShortcutContained;



import android.accessibilityservice.AccessibilityServiceInfo;

import android.annotation.NonNull;

import android.content.Context;

import android.view.accessibility.AccessibilityManager.ShortcutType;



import com.android.internal.accessibility.common.ShortcutConstants.AccessibilityFragmentType;

import com.android.internal.accessibility.common.ShortcutConstants.ShortcutMenuMode;

import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;



/**

 * Base class for creating accessibility service target with various fragment types related to
@@ -36,7 +35,7 @@ class AccessibilityServiceTarget extends AccessibilityTarget { 


    private final AccessibilityServiceInfo mAccessibilityServiceInfo;



    AccessibilityServiceTarget(Context context, @ShortcutType int shortcutType,

    AccessibilityServiceTarget(Context context, @UserShortcutType int shortcutType,

            @AccessibilityFragmentType int fragmentType,

            @NonNull AccessibilityServiceInfo serviceInfo) {

        super(context,
@@ -48,7 +47,7 @@ class AccessibilityServiceTarget extends AccessibilityTarget { 
                serviceInfo.getResolveInfo().serviceInfo.applicationInfo.uid,

                serviceInfo.getResolveInfo().loadLabel(context.getPackageManager()),

                serviceInfo.getResolveInfo().loadIcon(context.getPackageManager()),

                convertToKey(convertToUserType(shortcutType)));

                convertToKey(shortcutType));

        mAccessibilityServiceInfo = serviceInfo;

    }