diff options
author | jasonwshsu <jasonwshsu@google.com> | 2020-04-27 18:06:44 +0800 |
---|---|---|
committer | jasonwshsu <jasonwshsu@google.com> | 2020-04-28 00:55:04 +0800 |
commit | 43daeb90da13fcde61fe4f9cf20b43eaa65deb18 (patch) | |
tree | bea98c8d91797e3b1ab17a0801b1d5c0d5f664ed /src/com/android/settings/accessibility | |
parent | 7f15836d4743bbacd3a906397f70df5e6199a935 (diff) | |
download | packages_apps_Settings-43daeb90da13fcde61fe4f9cf20b43eaa65deb18.tar.gz packages_apps_Settings-43daeb90da13fcde61fe4f9cf20b43eaa65deb18.tar.bz2 packages_apps_Settings-43daeb90da13fcde61fe4f9cf20b43eaa65deb18.zip |
Change the name of accessibility service fragment type to more descriptive names
Bug: 155052371
Test: manual test
Change-Id: I097138c84083528acd4d16a145921227ffe3f736
Diffstat (limited to 'src/com/android/settings/accessibility')
-rw-r--r-- | src/com/android/settings/accessibility/AccessibilitySettings.java | 17 | ||||
-rw-r--r-- | src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java | 12 | ||||
-rw-r--r-- | src/com/android/settings/accessibility/AccessibilityUtil.java | 27 | ||||
-rw-r--r-- | src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java (renamed from src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java) | 2 | ||||
-rw-r--r-- | src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java (renamed from src/com/android/settings/accessibility/LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.java) | 4 | ||||
-rw-r--r-- | src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java (renamed from src/com/android/settings/accessibility/LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.java) | 4 |
6 files changed, 35 insertions, 31 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index becd4e78b0..f918046bc3 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -269,7 +269,7 @@ public class AccessibilitySettings extends DashboardFragment { final CharSequence serviceState; final int fragmentType = AccessibilityUtil.getAccessibilityServiceFragmentType(info); - if (fragmentType == AccessibilityServiceFragmentType.INVISIBLE) { + if (fragmentType == AccessibilityServiceFragmentType.INVISIBLE_TOGGLE) { final ComponentName componentName = new ComponentName( info.getResolveInfo().serviceInfo.packageName, info.getResolveInfo().serviceInfo.name); @@ -652,13 +652,16 @@ public class AccessibilitySettings extends DashboardFragment { } private String getAccessibilityServiceFragmentTypeName(AccessibilityServiceInfo info) { - switch (AccessibilityUtil.getAccessibilityServiceFragmentType( - info)) { - case AccessibilityServiceFragmentType.LEGACY: - return LegacyAccessibilityServicePreferenceFragment.class.getName(); - case AccessibilityServiceFragmentType.INVISIBLE: + // Shorten the name to avoid exceeding 100 characters in one line. + final String volumeShortcutToggleAccessibilityServicePreferenceFragment = + VolumeShortcutToggleAccessibilityServicePreferenceFragment.class.getName(); + + switch (AccessibilityUtil.getAccessibilityServiceFragmentType(info)) { + case AccessibilityServiceFragmentType.VOLUME_SHORTCUT_TOGGLE: + return volumeShortcutToggleAccessibilityServicePreferenceFragment; + case AccessibilityServiceFragmentType.INVISIBLE_TOGGLE: return InvisibleToggleAccessibilityServicePreferenceFragment.class.getName(); - case AccessibilityServiceFragmentType.INTUITIVE: + case AccessibilityServiceFragmentType.TOGGLE: return ToggleAccessibilityServicePreferenceFragment.class.getName(); default: // impossible status diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 2bcb5b3b3c..090e5d4849 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -16,7 +16,7 @@ package com.android.settings.accessibility; -import static com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType.LEGACY; +import static com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType.VOLUME_SHORTCUT_TOGGLE; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.settings.SettingsEnums; @@ -102,10 +102,10 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm super.onResume(); updateAccessibilityServicePreference(mScreenReaderPreference, SCREEN_READER_PACKAGE_NAME, SCREEN_READER_SERVICE_NAME, - LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.class.getName()); + VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.class.getName()); updateAccessibilityServicePreference(mSelectToSpeakPreference, SELECT_TO_SPEAK_PACKAGE_NAME, SELECT_TO_SPEAK_SERVICE_NAME, - LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.class.getName()); + VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.class.getName()); configureMagnificationPreferenceIfNeeded(mDisplayMagnificationPreference); } @@ -147,7 +147,7 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm } private void updateAccessibilityServicePreference(Preference preference, - String packageName, String serviceName, String targetLegacyFragment) { + String packageName, String serviceName, String targetFragment) { final AccessibilityServiceInfo info = findService(packageName, serviceName); if (info == null) { getPreferenceScreen().removePreference(preference); @@ -159,8 +159,8 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm preference.setTitle(title); ComponentName componentName = new ComponentName(serviceInfo.packageName, serviceInfo.name); preference.setKey(componentName.flattenToString()); - if (AccessibilityUtil.getAccessibilityServiceFragmentType(info) == LEGACY) { - preference.setFragment(targetLegacyFragment); + if (AccessibilityUtil.getAccessibilityServiceFragmentType(info) == VOLUME_SHORTCUT_TOGGLE) { + preference.setFragment(targetFragment); } // Update the extras. diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java index a0e3d81403..eb202b5b04 100644 --- a/src/com/android/settings/accessibility/AccessibilityUtil.java +++ b/src/com/android/settings/accessibility/AccessibilityUtil.java @@ -46,22 +46,23 @@ final class AccessibilityUtil { /** * Annotation for different accessibilityService fragment UI type. * - * {@code LEGACY} for displaying appearance aligned with sdk version Q accessibility service - * page, but only hardware shortcut allowed. - * {@code INVISIBLE} for displaying appearance without switch bar. - * {@code INTUITIVE} for displaying appearance with new design. + * {@code VOLUME_SHORTCUT_TOGGLE} for displaying basic accessibility service fragment but + * only hardware shortcut allowed. + * {@code INVISIBLE_TOGGLE} for displaying basic accessibility service fragment without + * switch bar. + * {@code TOGGLE} for displaying basic accessibility service fragment. */ @Retention(RetentionPolicy.SOURCE) @IntDef({ - AccessibilityServiceFragmentType.LEGACY, - AccessibilityServiceFragmentType.INVISIBLE, - AccessibilityServiceFragmentType.INTUITIVE, + AccessibilityServiceFragmentType.VOLUME_SHORTCUT_TOGGLE, + AccessibilityServiceFragmentType.INVISIBLE_TOGGLE, + AccessibilityServiceFragmentType.TOGGLE, }) public @interface AccessibilityServiceFragmentType { - int LEGACY = 0; - int INVISIBLE = 1; - int INTUITIVE = 2; + int VOLUME_SHORTCUT_TOGGLE = 0; + int INVISIBLE_TOGGLE = 1; + int TOGGLE = 2; } // TODO(b/147021230): Will move common functions and variables to @@ -162,11 +163,11 @@ final class AccessibilityUtil { & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0; if (targetSdk <= Build.VERSION_CODES.Q) { - return AccessibilityServiceFragmentType.LEGACY; + return AccessibilityServiceFragmentType.VOLUME_SHORTCUT_TOGGLE; } return requestA11yButton - ? AccessibilityServiceFragmentType.INVISIBLE - : AccessibilityServiceFragmentType.INTUITIVE; + ? AccessibilityServiceFragmentType.INVISIBLE_TOGGLE + : AccessibilityServiceFragmentType.TOGGLE; } /** diff --git a/src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java index c5cede3453..31f97a8f60 100644 --- a/src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java @@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableSet; * * <p>For accessibility services that target SDK <= Q. */ -public class LegacyAccessibilityServicePreferenceFragment extends +public class VolumeShortcutToggleAccessibilityServicePreferenceFragment extends ToggleAccessibilityServicePreferenceFragment { @Override diff --git a/src/com/android/settings/accessibility/LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java index 1b37a42afb..6e4a233c60 100644 --- a/src/com/android/settings/accessibility/LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -21,8 +21,8 @@ import android.os.Bundle; import android.view.View; /** For accessibility services that target SDK <= Q in setup wizard. */ -public class LegacyToggleScreenReaderPreferenceFragmentForSetupWizard - extends LegacyAccessibilityServicePreferenceFragment { +public class VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard + extends VolumeShortcutToggleAccessibilityServicePreferenceFragment { private boolean mToggleSwitchWasInitiallyChecked; diff --git a/src/com/android/settings/accessibility/LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java index ffb363cd15..3dd648cd59 100644 --- a/src/com/android/settings/accessibility/LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java @@ -21,8 +21,8 @@ import android.os.Bundle; import android.view.View; /** For accessibility services that target SDK <= Q in setup wizard. */ -public class LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard - extends LegacyAccessibilityServicePreferenceFragment { +public class VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard + extends VolumeShortcutToggleAccessibilityServicePreferenceFragment { private boolean mToggleSwitchWasInitiallyChecked; |