PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chun-Ku Lin
2024-04-01 17:30:46 +00:00
committed by Android (Google) Code Review
parent ef2a778f0a 3aeabcc2c2
commit 1dbd383b95
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
View File

@@ -54,6 +54,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView; 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.AccessibilityTarget;
import com.android.internal.accessibility.dialog.AccessibilityTargetHelper; import com.android.internal.accessibility.dialog.AccessibilityTargetHelper;
import com.android.settings.R; import com.android.settings.R;
@@ -204,7 +205,7 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
// TODO(b/325664350): Implement shortcut type for "all shortcuts" // TODO(b/325664350): Implement shortcut type for "all shortcuts"
List<AccessibilityTarget> accessibilityTargets = List<AccessibilityTarget> accessibilityTargets =
AccessibilityTargetHelper.getInstalledTargets( AccessibilityTargetHelper.getInstalledTargets(
activity.getBaseContext(), AccessibilityManager.ACCESSIBILITY_SHORTCUT_KEY); activity.getBaseContext(), ShortcutConstants.UserShortcutType.HARDWARE);
Pair<String, String> titles = getTitlesFromAccessibilityTargetList( Pair<String, String> titles = getTitlesFromAccessibilityTargetList(
mShortcutTargets, mShortcutTargets,

3
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -41,6 +41,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.internal.accessibility.common.ShortcutConstants;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityShortcutsTutorial; import com.android.settings.accessibility.AccessibilityShortcutsTutorial;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
@@ -366,7 +367,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
private boolean isAnyServiceSupportAccessibilityButton() { private boolean isAnyServiceSupportAccessibilityButton() {
final AccessibilityManager ams = getContext().getSystemService(AccessibilityManager.class); final AccessibilityManager ams = getContext().getSystemService(AccessibilityManager.class);
final List<String> targets = ams.getAccessibilityShortcutTargets( final List<String> targets = ams.getAccessibilityShortcutTargets(
AccessibilityManager.ACCESSIBILITY_BUTTON); ShortcutConstants.UserShortcutType.SOFTWARE);
return !targets.isEmpty(); return !targets.isEmpty();
} }