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

Commit 7d9af05e authored by Peter_Liang's avatar Peter_Liang
Browse files

Redesign for AccessibilityShortcutChooserActivity (2/n). 

Refactor and replace it with new components and functions.

Bug: 147655054
Test: manual test
Change-Id: I12ef647ef0524d2d2cada63c46341c0fddb828da
parent fbad548b

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

+57 −635

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+201 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.dialog;



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



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

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

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

import static com.android.internal.accessibility.util.AccessibilityUtils.getAccessibilityServiceFragmentType;

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



import android.accessibilityservice.AccessibilityServiceInfo;

import android.accessibilityservice.AccessibilityShortcutInfo;

import android.annotation.NonNull;

import android.app.ActivityManager;

import android.content.ComponentName;

import android.content.Context;

import android.os.Build;

import android.provider.Settings;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityManager.ShortcutType;



import com.android.internal.R;

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



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;



/**

 * Collection of utilities for accessibility target.

 */

final class AccessibilityTargetHelper {

    private AccessibilityTargetHelper() {}



    static List<AccessibilityTarget> getTargets(Context context,

            @ShortcutType int shortcutType) {

        final List<AccessibilityTarget> targets = getInstalledTargets(context, shortcutType);

        final AccessibilityManager ams = context.getSystemService(AccessibilityManager.class);

        final List<String> requiredTargets = ams.getAccessibilityShortcutTargets(shortcutType);

        targets.removeIf(target -> !requiredTargets.contains(target.getId()));



        return targets;

    }



    static List<AccessibilityTarget> getInstalledTargets(Context context,

            @ShortcutType int shortcutType) {

        final List<AccessibilityTarget> targets = new ArrayList<>();

        targets.addAll(getAccessibilityFilteredTargets(context, shortcutType));

        targets.addAll(getWhiteListingFeatureTargets(context, shortcutType));



        return targets;

    }



    private static List<AccessibilityTarget> getAccessibilityFilteredTargets(Context context,

            @ShortcutType int shortcutType) {

        final List<AccessibilityTarget> serviceTargets =

                getAccessibilityServiceTargets(context, shortcutType);

        final List<AccessibilityTarget> activityTargets =

                getAccessibilityActivityTargets(context, shortcutType);



        for (AccessibilityTarget activityTarget : activityTargets) {

            serviceTargets.removeIf(

                    serviceTarget -> arePackageNameAndLabelTheSame(serviceTarget, activityTarget));

        }



        final List<AccessibilityTarget> targets = new ArrayList<>();

        targets.addAll(serviceTargets);

        targets.addAll(activityTargets);



        return targets;

    }



    private static boolean arePackageNameAndLabelTheSame(@NonNull AccessibilityTarget serviceTarget,

            @NonNull AccessibilityTarget activityTarget) {

        final ComponentName serviceComponentName =

                ComponentName.unflattenFromString(serviceTarget.getId());

        final ComponentName activityComponentName =

                ComponentName.unflattenFromString(activityTarget.getId());

        final boolean isSamePackageName = activityComponentName.getPackageName().equals(

                serviceComponentName.getPackageName());

        final boolean isSameLabel = activityTarget.getLabel().equals(

                serviceTarget.getLabel());



        return isSamePackageName && isSameLabel;

    }



    private static List<AccessibilityTarget> getAccessibilityServiceTargets(Context context,

            @ShortcutType int shortcutType) {

        final AccessibilityManager ams = context.getSystemService(AccessibilityManager.class);

        final List<AccessibilityServiceInfo> installedServices =

                ams.getInstalledAccessibilityServiceList();

        if (installedServices == null) {

            return Collections.emptyList();

        }



        final List<AccessibilityTarget> targets = new ArrayList<>(installedServices.size());

        for (AccessibilityServiceInfo info : installedServices) {

            final int targetSdk =

                    info.getResolveInfo().serviceInfo.applicationInfo.targetSdkVersion;

            final boolean hasRequestAccessibilityButtonFlag =

                    (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0;

            if ((targetSdk <= Build.VERSION_CODES.Q) && !hasRequestAccessibilityButtonFlag

                    && (shortcutType == ACCESSIBILITY_BUTTON)) {

                continue;

            }



            targets.add(createAccessibilityServiceTarget(context, shortcutType, info));

        }



        return targets;

    }



    private static List<AccessibilityTarget> getAccessibilityActivityTargets(Context context,

            @ShortcutType int shortcutType) {

        final AccessibilityManager ams = context.getSystemService(AccessibilityManager.class);

        final List<AccessibilityShortcutInfo> installedServices =

                ams.getInstalledAccessibilityShortcutListAsUser(context,

                        ActivityManager.getCurrentUser());

        if (installedServices == null) {

            return Collections.emptyList();

        }



        final List<AccessibilityTarget> targets = new ArrayList<>(installedServices.size());

        for (AccessibilityShortcutInfo info : installedServices) {

            targets.add(new AccessibilityActivityTarget(context, shortcutType, info));

        }



        return targets;

    }



    private static List<AccessibilityTarget> getWhiteListingFeatureTargets(Context context,

            @ShortcutType int shortcutType) {

        final List<AccessibilityTarget> targets = new ArrayList<>();



        final InvisibleToggleWhiteListingFeatureTarget magnification =

                new InvisibleToggleWhiteListingFeatureTarget(context,

                shortcutType,

                isShortcutContained(context, shortcutType, MAGNIFICATION_CONTROLLER_NAME),

                MAGNIFICATION_CONTROLLER_NAME,

                context.getString(R.string.accessibility_magnification_chooser_text),

                context.getDrawable(R.drawable.ic_accessibility_magnification),

                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED);



        final ToggleWhiteListingFeatureTarget daltonizer =

                new ToggleWhiteListingFeatureTarget(context,

                shortcutType,

                isShortcutContained(context, shortcutType,

                        DALTONIZER_COMPONENT_NAME.flattenToString()),

                DALTONIZER_COMPONENT_NAME.flattenToString(),

                context.getString(R.string.color_correction_feature_name),

                context.getDrawable(R.drawable.ic_accessibility_color_correction),

                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);



        final ToggleWhiteListingFeatureTarget colorInversion =

                new ToggleWhiteListingFeatureTarget(context,

                shortcutType,

                isShortcutContained(context, shortcutType,

                        COLOR_INVERSION_COMPONENT_NAME.flattenToString()),

                COLOR_INVERSION_COMPONENT_NAME.flattenToString(),

                context.getString(R.string.color_inversion_feature_name),

                context.getDrawable(R.drawable.ic_accessibility_color_inversion),

                Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED);



        targets.add(magnification);

        targets.add(daltonizer);

        targets.add(colorInversion);



        return targets;

    }



    private static AccessibilityTarget createAccessibilityServiceTarget(Context context,

            @ShortcutType int shortcutType, @NonNull AccessibilityServiceInfo info) {

        switch (getAccessibilityServiceFragmentType(info)) {

            case AccessibilityFragmentType.VOLUME_SHORTCUT_TOGGLE:

                return new VolumeShortcutToggleAccessibilityServiceTarget(context, shortcutType,

                        info);

            case AccessibilityFragmentType.INVISIBLE_TOGGLE:

                return new InvisibleToggleAccessibilityServiceTarget(context, shortcutType, info);

            case AccessibilityFragmentType.TOGGLE:

                return new ToggleAccessibilityServiceTarget(context, shortcutType, info);

            default:

                throw new IllegalStateException("Unexpected fragment type");

        }

    }

}

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

0 → 100644
+92 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.dialog;



import android.annotation.NonNull;

import android.content.Context;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;



import com.android.internal.R;

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



import java.util.List;



/**

 * Extension for {@link TargetAdapter} and used for AccessibilityShortcutChooserActivity.

 */

class ShortcutTargetAdapter extends TargetAdapter {

    @ShortcutMenuMode

    private int mShortcutMenuMode = ShortcutMenuMode.LAUNCH;

    private final List<AccessibilityTarget> mTargets;



    ShortcutTargetAdapter(@NonNull List<AccessibilityTarget> targets) {

        mTargets = targets;

    }



    @Override

    public int getCount() {

        return mTargets.size();

    }



    @Override

    public Object getItem(int position) {

        return mTargets.get(position);

    }



    @Override

    public long getItemId(int position) {

        return position;

    }



    @Override

    public View getView(int position, View convertView, ViewGroup parent) {

        final Context context = parent.getContext();

        ViewHolder holder;

        if (convertView == null) {

            convertView = LayoutInflater.from(context).inflate(

                    R.layout.accessibility_shortcut_chooser_item, parent, /* attachToRoot= */

                    false);

            holder = new ViewHolder();

            holder.mCheckBoxView = convertView.findViewById(

                    R.id.accessibility_shortcut_target_checkbox);

            holder.mIconView = convertView.findViewById(R.id.accessibility_shortcut_target_icon);

            holder.mLabelView = convertView.findViewById(

                    R.id.accessibility_shortcut_target_label);

            holder.mSwitchItem = convertView.findViewById(

                    R.id.accessibility_shortcut_target_switch_item);

            convertView.setTag(holder);

        } else {

            holder = (ViewHolder) convertView.getTag();

        }



        final AccessibilityTarget target = mTargets.get(position);

        target.updateActionItem(holder, mShortcutMenuMode);



        return convertView;

    }



    void setShortcutMenuMode(@ShortcutMenuMode int shortcutMenuMode) {

        mShortcutMenuMode = shortcutMenuMode;

    }



    @ShortcutMenuMode

    int getShortcutMenuMode() {

        return mShortcutMenuMode;

    }

}