Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (7/n)
- Remove shortcut preference in CarDeveloperOptions
Bug: 142529032
Test: Manual test
Change-Id: Ie7653ebf76f24ed39dc350bda1f35cb3e0e58fc1
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/accessibility/AccessibilityShortcutPreferenceFragment.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/accessibility/AccessibilityShortcutPreferenceFragment.java
deleted file mode 100644
index 16d005b..0000000
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2019 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.car.developeroptions.accessibility;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.annotation.Nullable;
-import android.app.settings.SettingsEnums;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.view.accessibility.AccessibilityManager;
-import android.widget.Switch;
-
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.car.developeroptions.R;
-import com.android.car.developeroptions.search.BaseSearchIndexProvider;
-import com.android.internal.accessibility.AccessibilityShortcutController;
-import com.android.settingslib.accessibility.AccessibilityUtils;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
-
-/**
- * Settings page for accessibility shortcut
- */
-@SearchIndexable
-public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePreferenceFragment
- implements Indexable {
-
- public static final String SHORTCUT_SERVICE_KEY = "accessibility_shortcut_service";
- public static final String ON_LOCK_SCREEN_KEY = "accessibility_shortcut_on_lock_screen";
-
- private Preference mServicePreference;
- private SwitchPreference mOnLockScreenSwitchPreference;
- private final ContentObserver mContentObserver = new ContentObserver(new Handler()) {
- @Override
- public void onChange(boolean selfChange) {
- updatePreferences();
- }
- };
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
- }
-
- @Override
- public int getHelpResource() {
- return R.string.help_url_accessibility_shortcut;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- mServicePreference = findPreference(SHORTCUT_SERVICE_KEY);
- mOnLockScreenSwitchPreference = (SwitchPreference) findPreference(ON_LOCK_SCREEN_KEY);
- mOnLockScreenSwitchPreference.setOnPreferenceChangeListener((Preference p, Object o) -> {
- Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN,
- ((Boolean) o) ? 1 : 0);
- return true;
- });
- }
-
- @Override
- public void onResume() {
- super.onResume();
- updatePreferences();
- getContentResolver().registerContentObserver(
- Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN),
- false, mContentObserver);
- }
-
- @Override
- public void onPause() {
- getContentResolver().unregisterContentObserver(mContentObserver);
- super.onPause();
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.accessibility_shortcut_settings;
- }
-
- @Override
- protected void onInstallSwitchBarToggleSwitch() {
- super.onInstallSwitchBarToggleSwitch();
- mSwitchBar.addOnSwitchChangeListener((Switch switchView, boolean enabled) -> {
- Context context = getContext();
- if (enabled && !shortcutFeatureAvailable(context)) {
- // If no service is configured, we'll disable the shortcut shortly. Give the
- // user a chance to select a service. We'll update the preferences when we resume.
- Settings.Secure.putInt(
- getContentResolver(), Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 1);
- mServicePreference.setEnabled(true);
- mServicePreference.performClick();
- } else {
- onPreferenceToggled(Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, enabled);
- }
- });
- }
-
- @Override
- protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
- Settings.Secure.putInt(getContentResolver(), preferenceKey, enabled ? 1 : 0);
- updatePreferences();
- }
-
- private void updatePreferences() {
- ContentResolver cr = getContentResolver();
- Context context = getContext();
- mServicePreference.setSummary(getServiceName(context));
- if (!shortcutFeatureAvailable(context)) {
- // If no service is configured, make sure the overall shortcut is turned off
- Settings.Secure.putInt(
- getContentResolver(), Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 0);
- }
- boolean isEnabled = Settings.Secure
- .getInt(cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 1) == 1;
- mSwitchBar.setChecked(isEnabled);
- // The shortcut is enabled by default on the lock screen as long as the user has
- // enabled the shortcut with the warning dialog
- final int dialogShown = Settings.Secure.getInt(
- cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, 0);
- final boolean enabledFromLockScreen = Settings.Secure.getInt(
- cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, dialogShown) == 1;
- mOnLockScreenSwitchPreference.setChecked(enabledFromLockScreen);
- // Only enable changing the service and lock screen behavior if the shortcut is on
- mServicePreference.setEnabled(mToggleSwitch.isChecked());
- mOnLockScreenSwitchPreference.setEnabled(mToggleSwitch.isChecked());
- }
-
- /**
- * Get the user-visible name of the service currently selected for the shortcut.
- *
- * @param context The current context
- * @return The name of the service or a string saying that none is selected.
- */
- public static CharSequence getServiceName(Context context) {
- if (!shortcutFeatureAvailable(context)) {
- return context.getString(R.string.accessibility_no_service_selected);
- }
- AccessibilityServiceInfo shortcutServiceInfo = getServiceInfo(context);
- if (shortcutServiceInfo != null) {
- return shortcutServiceInfo.getResolveInfo().loadLabel(context.getPackageManager());
- }
- return AccessibilityShortcutController.getFrameworkShortcutFeaturesMap()
- .get(getShortcutComponent(context)).getLabel(context);
- }
-
- private static AccessibilityServiceInfo getServiceInfo(Context context) {
- return AccessibilityManager.getInstance(context)
- .getInstalledServiceInfoWithComponentName(getShortcutComponent(context));
- }
-
- private static boolean shortcutFeatureAvailable(Context context) {
- ComponentName shortcutFeature = getShortcutComponent(context);
- if (shortcutFeature == null) return false;
-
- if (AccessibilityShortcutController.getFrameworkShortcutFeaturesMap()
- .containsKey(shortcutFeature)) {
- return true;
- }
- return getServiceInfo(context) != null;
- }
-
- private static @Nullable ComponentName getShortcutComponent(Context context) {
- String componentNameString = AccessibilityUtils.getShortcutTargetServiceComponentNameString(
- context, UserHandle.myUserId());
- if (componentNameString == null) return null;
- return ComponentName.unflattenFromString(componentNameString);
- }
-
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- // This fragment is for details of the shortcut. Only the shortcut itself needs
- // to be indexed.
- protected boolean isPageSearchEnabled(Context context) {
- return false;
- }
- };
-}
