Merge "Fix the GAR issue of all the icons on A11y FM have no meaningful A11y label." into sc-dev (42c7ce49) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static com.android.internal.accessibility.util.ShortcutUtils.optInValueTo
		import static com.android.internal.accessibility.util.ShortcutUtils.optOutValueFromSettings;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.graphics.drawable.Drawable;
		import android.view.View;
		@@ -33,6 +34,7 @@ import android.view.accessibility.AccessibilityManager.ShortcutType;
		import com.android.internal.accessibility.common.ShortcutConstants;
		import com.android.internal.accessibility.common.ShortcutConstants.AccessibilityFragmentType;
		import com.android.internal.accessibility.dialog.TargetAdapter.ViewHolder;
		import com.android.internal.annotations.VisibleForTesting;

		/**
		* Abstract base class for creating various target related to accessibility service,
		@@ -51,7 +53,8 @@ public abstract class AccessibilityTarget implements TargetOperations, OnTargetS
		private Drawable mIcon;
		private String mKey;

		AccessibilityTarget(Context context, @ShortcutType int shortcutType,
		@VisibleForTesting
		public AccessibilityTarget(Context context, @ShortcutType int shortcutType,
		@AccessibilityFragmentType int fragmentType, boolean isShortcutSwitched, String id,
		CharSequence label, Drawable icon, String key) {
		mContext = context;
		@@ -103,6 +106,16 @@ public abstract class AccessibilityTarget implements TargetOperations, OnTargetS
		}
		}

		/**
		* Gets the state description of this feature target.
		*
		* @return the state description
		*/
		@Nullable
		public CharSequence getStateDescription() {
		return null;
		}

		public void setShortcutEnabled(boolean enabled) {
		mShortcutEnabled = enabled;
		}

core/java/com/android/internal/accessibility/dialog/ToggleAccessibilityServiceTarget.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -51,10 +51,14 @@ class ToggleAccessibilityServiceTarget extends AccessibilityServiceTarget {
		final boolean isEditMenuMode =
		shortcutMenuMode == ShortcutMenuMode.EDIT;
		holder.mStatusView.setVisibility(isEditMenuMode ? View.GONE : View.VISIBLE);
		holder.mStatusView.setText(getStateDescription());
		}

		@Override
		public CharSequence getStateDescription() {
		final int statusResId = isAccessibilityServiceEnabled(getContext(), getId())
		? R.string.accessibility_shortcut_menu_item_status_on
		: R.string.accessibility_shortcut_menu_item_status_off;
		holder.mStatusView.setText(getContext().getString(statusResId));
		return getContext().getString(statusResId);
		}
		}

core/java/com/android/internal/accessibility/dialog/ToggleAllowListingFeatureTarget.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -48,11 +48,15 @@ class ToggleAllowListingFeatureTarget extends AccessibilityTarget {
		final boolean isEditMenuMode =
		shortcutMenuMode == ShortcutMenuMode.EDIT;
		holder.mStatusView.setVisibility(isEditMenuMode ? View.GONE : View.VISIBLE);
		holder.mStatusView.setText(getStateDescription());
		}

		@Override
		public CharSequence getStateDescription() {
		final int statusResId = isFeatureEnabled()
		? R.string.accessibility_shortcut_menu_item_status_on
		: R.string.accessibility_shortcut_menu_item_status_off;
		holder.mStatusView.setText(getContext().getString(statusResId));
		return getContext().getString(statusResId);
		}

		private boolean isFeatureEnabled() {

packages/SystemUI/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -2729,6 +2729,8 @@
		<string name="accessibility_floating_button_action_move_to_edge_and_hide_to_half">Move to edge and hide</string>
		<!-- Action in accessibility menu to move the accessibility floating button out the edge and show. [CHAR LIMIT=36]-->
		<string name="accessibility_floating_button_action_move_out_edge_and_show">Move out edge and show</string>
		<!-- Action in accessibility menu to toggle on/off the accessibility feature. [CHAR LIMIT=30]-->
		<string name="accessibility_floating_button_action_double_tap_to_toggle">toggle</string>

		<!-- Device Controls strings -->
		<!-- Device Controls empty state, title [CHAR LIMIT=30] -->

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenu.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -70,9 +70,16 @@ public class AccessibilityFloatingMenu implements IAccessibilityFloatingMenu {
		}
		};

		private final ContentObserver mEnabledA11yServicesContentObserver =
		new ContentObserver(mHandler) {
		@Override
		public void onChange(boolean selfChange) {
		mMenuView.onEnabledFeaturesChanged();
		}
		};

		public AccessibilityFloatingMenu(Context context) {
		mContext = context;
		mMenuView = new AccessibilityFloatingMenuView(context);
		this(context, new AccessibilityFloatingMenuView(context));
		}

		@VisibleForTesting
		@@ -153,11 +160,17 @@ public class AccessibilityFloatingMenu implements IAccessibilityFloatingMenu {
		Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY),
		/* notifyForDescendants */ false, mFadeOutContentObserver,
		UserHandle.USER_CURRENT);
		mContext.getContentResolver().registerContentObserver(
		Settings.Secure.getUriFor(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES),
		/* notifyForDescendants */ false,
		mEnabledA11yServicesContentObserver, UserHandle.USER_CURRENT);
		}

		private void unregisterContentObservers() {
		mContext.getContentResolver().unregisterContentObserver(mContentObserver);
		mContext.getContentResolver().unregisterContentObserver(mSizeContentObserver);
		mContext.getContentResolver().unregisterContentObserver(mFadeOutContentObserver);
		mContext.getContentResolver().unregisterContentObserver(
		mEnabledA11yServicesContentObserver);
		}
		}