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

Commit 1dbd383b 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 ef2a778f 3aeabcc2

src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.Preference;

import androidx.recyclerview.widget.RecyclerView;



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

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

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

import com.android.settings.R;
@@ -204,7 +205,7 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment { 
        // TODO(b/325664350): Implement shortcut type for "all shortcuts"

        List<AccessibilityTarget> accessibilityTargets =

                AccessibilityTargetHelper.getInstalledTargets(

                        activity.getBaseContext(), AccessibilityManager.ACCESSIBILITY_SHORTCUT_KEY);

                        activity.getBaseContext(), ShortcutConstants.UserShortcutType.HARDWARE);



        Pair<String, String> titles = getTitlesFromAccessibilityTargetList(

                mShortcutTargets,

src/com/android/settings/gestures/SystemNavigationGestureSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import androidx.annotation.Nullable; 
import androidx.annotation.VisibleForTesting;

import androidx.preference.PreferenceScreen;



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

import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityShortcutsTutorial;

import com.android.settings.core.BasePreferenceController;
@@ -366,7 +367,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i 
    private boolean isAnyServiceSupportAccessibilityButton() {

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

        final List<String> targets = ams.getAccessibilityShortcutTargets(

                AccessibilityManager.ACCESSIBILITY_BUTTON);

                ShortcutConstants.UserShortcutType.SOFTWARE);

        return !targets.isEmpty();

    }