Merge "Disabling elements on the A11y Shortcut setting subpage" into main (6e121940) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -5722,6 +5722,8 @@
		<string name="accessibility_shortcut_edit_screen_title">Edit accessibility shortcuts</string>
		<!-- Prompt for editing the shortcuts of multiple accessibility features. [CHAR LIMIT=NONE] -->
		<string name="accessibility_shortcut_edit_screen_prompt">Choose your shortcut for %1$s</string>
		<!-- Summary to display when a shortcut setting is disabled, due to the shortcut being unassigned -->
		<string name="accessibility_shortcut_unassigned_setting_unavailable_summary">To use this, turn on the %1$s shortcut on an accessibility feature\'s page</string>

		<!-- Button text for the accessibility dialog continue to the next screen for hearing aid. [CHAR LIMIT=32] -->
		<string name="accessibility_hearingaid_instruction_continue_button">Continue</string>

res/xml/accessibility_shortcuts_settings.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="accessibility_shortcuts_settings"
		android:persistent="false"
		android:title="@string/accessibility_shortcuts_settings_title">
		android:title="@string/accessibility_shortcuts_settings_title"
		settings:searchable="false">

		<Preference
		android:fragment="com.android.settings.accessibility.AccessibilityButtonFragment"
		@@ -33,5 +34,5 @@
		android:persistent="false"
		android:title="@string/accessibility_shortcut_service_on_lock_screen_title"
		android:summary="@string/accessibility_shortcut_description"
		settings:controller="com.android.settings.accessibility.AccessibilityShortcutPreferenceController"/>
		settings:controller="com.android.settings.accessibility.HardwareShortcutFromLockscreenPreferenceController"/>
		</PreferenceScreen>

src/com/android/settings/accessibility/AccessibilityButtonFragment.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -16,9 +16,14 @@

		package com.android.settings.accessibility;

		import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;

		import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.os.Bundle;
		import android.provider.Settings;

		import com.android.internal.accessibility.util.ShortcutUtils;
		import com.android.settings.R;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.search.BaseSearchIndexProvider;
		@@ -61,5 +66,13 @@ public class AccessibilityButtonFragment extends DashboardFragment {
		}

		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.accessibility_button_settings);
		new BaseSearchIndexProvider(R.xml.accessibility_button_settings) {
		@Override
		protected boolean isPageSearchEnabled(Context context) {
		// Page should be unsearchable if there are no active button targets
		String targets = Settings.Secure.getStringForUser(context.getContentResolver(),
		ShortcutUtils.convertToKey(SOFTWARE), context.getUserId());
		return targets != null && !targets.isEmpty();
		}
		};
		}

src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java

+31 −3

Original line number	Diff line number	Diff line
		@@ -16,9 +16,13 @@

		package com.android.settings.accessibility;

		import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;

		import android.content.Context;
		import android.content.res.Resources;
		import android.view.accessibility.AccessibilityManager;

		import androidx.annotation.NonNull;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		@@ -32,22 +36,46 @@ import java.util.List;
		* Preference controller for accessibility button preference.
		*/
		public class AccessibilityButtonPreferenceController extends BasePreferenceController {

		public AccessibilityButtonPreferenceController(Context context, String key) {
		super(context, key);
		}

		@Override
		public int getAvailabilityStatus() {
		if (!com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
		return AVAILABLE;
		} else {
		if (mContext.getSystemService(AccessibilityManager.class)
		.getAccessibilityShortcutTargets(SOFTWARE).isEmpty()) {
		return DISABLED_DEPENDENT_SETTING;
		} else {
		return AVAILABLE;
		}
		}
		}

		@Override
		public void updateState(@NonNull Preference preference) {
		super.updateState(preference);
		refreshSummary(preference);
		}

		@Override
		public @NonNull CharSequence getSummary() {
		if (getAvailabilityStatus() == AVAILABLE) {
		return "";
		} else {
		return mContext.getString(
		R.string.accessibility_shortcut_unassigned_setting_unavailable_summary,
		AccessibilityUtil.getShortcutSummaryList(mContext, SOFTWARE));
		}
		}

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		final Preference preference = screen.findPreference(getPreferenceKey());
		preference.setTitle(getPreferenceTitleResource());

		}

		@Override

src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java→src/com/android/settings/accessibility/HardwareShortcutFromLockscreenPreferenceController.java

+37 −5

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package com.android.settings.accessibility;

		import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
		import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
		import static com.android.settings.accessibility.AccessibilityUtil.State.ON;

		@@ -22,16 +23,21 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.view.accessibility.AccessibilityManager;

		import androidx.annotation.NonNull;
		import androidx.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.core.TogglePreferenceController;

		/**
		* Settings page for accessibility shortcut
		* Setting to allow the hardware shortcut to turn on from the lock screen
		*/
		public class AccessibilityShortcutPreferenceController extends TogglePreferenceController {

		public AccessibilityShortcutPreferenceController(Context context, String preferenceKey) {
		public class HardwareShortcutFromLockscreenPreferenceController
		extends TogglePreferenceController {
		public HardwareShortcutFromLockscreenPreferenceController(
		Context context, String preferenceKey) {
		super(context, preferenceKey);
		}

		@@ -56,8 +62,34 @@ public class AccessibilityShortcutPreferenceController extends TogglePreferenceC

		@Override
		public int getAvailabilityStatus() {
		if (!com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
		return AVAILABLE;
		} else {
		if (mContext.getSystemService(AccessibilityManager.class)
		.getAccessibilityShortcutTargets(HARDWARE).isEmpty()) {
		return DISABLED_DEPENDENT_SETTING;
		} else {
		return AVAILABLE;
		}
		}
		}

		@Override
		public void updateState(@NonNull Preference preference) {
		super.updateState(preference);
		refreshSummary(preference);
		}

		@Override
		public @NonNull CharSequence getSummary() {
		if (getAvailabilityStatus() == AVAILABLE) {
		return mContext.getString(R.string.accessibility_shortcut_description);
		} else {
		return mContext.getString(
		R.string.accessibility_shortcut_unassigned_setting_unavailable_summary,
		AccessibilityUtil.getShortcutSummaryList(mContext, HARDWARE));
		}
		}

		@Override
		public int getSliceHighlightMenuRes() {