Snap for 5900353 from b069e83cfeb42a5b40a3be9f0e2155bead05b007 to qt-qpr1-release (9829f809) · Commits · e / os / android_frameworks_base

core/java/android/view/accessibility/AccessibilityNodeProvider.java

+114 −16

Original line number	Diff line number	Diff line
		@@ -44,28 +44,126 @@ import java.util.List;
		* View itself. Similarly the returned instance is responsible for performing accessibility
		* actions on any virtual view or the root view itself. For example:
		* </p>
		* <pre>
		* getAccessibilityNodeProvider(
		* if (mAccessibilityNodeProvider == null) {
		* mAccessibilityNodeProvider = new AccessibilityNodeProvider() {
		* public boolean performAction(int action, int virtualDescendantId) {
		* // Implementation.
		* return false;
		* <div>
		* <div class="ds-selector-tabs"><section><h3 id="kotlin">Kotlin</h3>
		* <pre class="prettyprint lang-kotlin">
		* // "view" is the View instance on which this class performs accessibility functions.
		* class MyCalendarViewAccessibilityDelegate(
		* private var view: MyCalendarView) : AccessibilityDelegate() {
		* override fun getAccessibilityNodeProvider(host: View): AccessibilityNodeProvider {
		* return object : AccessibilityNodeProvider() {
		* override fun createAccessibilityNodeInfo(virtualViewId: Int):
		* AccessibilityNodeInfo? {
		* when (virtualViewId) {
		* <var>host-view-id</var> -> {
		* val node = AccessibilityNodeInfo.obtain(view)
		* node.addChild(view, <var>child-view-id</var>)
		* // Set other attributes like screenReaderFocusable
		* // and contentDescription.
		* return node
		* }
		* <var>child-view-id</var> -> {
		* val node = AccessibilityNodeInfo
		* .obtain(view, virtualViewId)
		* node.setParent(view)
		* node.addAction(ACTION_SCROLL_UP)
		* node.addAction(ACTION_SCROLL_DOWN)
		* // Set other attributes like focusable and visibleToUser.
		* node.setBoundsInScreen(
		* Rect(<var>coords-of-edges-relative-to-screen</var>))
		* return node
		* }
		* else -> return null
		* }
		* }
		*
		* public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String text,
		* int virtualDescendantId) {
		* // Implementation.
		* return null;
		* override fun performAction(
		* virtualViewId: Int,
		* action: Int,
		* arguments: Bundle
		* ): Boolean {
		* if (virtualViewId == <var>host-view-id</var>) {
		* return view.performAccessibilityAction(action, arguments)
		* }
		* when (action) {
		* ACTION_SCROLL_UP.id -> {
		* // Implement logic in a separate method.
		* navigateToPreviousMonth()
		*
		* public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualDescendantId) {
		* // Implementation.
		* return null;
		* return true
		* }
		* ACTION_SCROLL_DOWN.id ->
		* // Implement logic in a separate method.
		* navigateToNextMonth()
		*
		* return true
		* else -> return false
		* }
		* }
		* }
		* }
		* }
		* });
		* return mAccessibilityNodeProvider;
		* </pre>
		* </section><section><h3 id="java">Java</h3>
		* <pre class="prettyprint lang-java">
		* final class MyCalendarViewAccessibilityDelegate extends AccessibilityDelegate {
		* // The View instance on which this class performs accessibility functions.
		* private final MyCalendarView view;
		*
		* MyCalendarViewAccessibilityDelegate(MyCalendarView view) {
		* this.view = view;
		* }
		*
		* @Override
		* public AccessibilityNodeProvider getAccessibilityNodeProvider(View host) {
		* return new AccessibilityNodeProvider() {
		* @Override
		* @Nullable
		* public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {
		* if (virtualViewId == <var>host-view-id</var>) {
		* AccessibilityNodeInfo node = AccessibilityNodeInfo.obtain(view);
		* node.addChild(view, <var>child-view-id</var>);
		* // Set other attributes like screenReaderFocusable and contentDescription.
		* return node;
		* } else if (virtualViewId == <var>child-view-id</var>) {
		* AccessibilityNodeInfo node =
		* AccessibilityNodeInfo.obtain(view, virtualViewId);
		* node.setParent(view);
		* node.addAction(ACTION_SCROLL_UP);
		* node.addAction(ACTION_SCROLL_DOWN);
		* // Set other attributes like focusable and visibleToUser.
		* node.setBoundsInScreen(
		* new Rect(<var>coordinates-of-edges-relative-to-screen</var>));
		* return node;
		* } else {
		* return null;
		* }
		* }
		*
		* @Override
		* public boolean performAction(int virtualViewId, int action, Bundle arguments) {
		* if (virtualViewId == <var>host-view-id</var>) {
		* return view.performAccessibilityAction(action, arguments);
		* }
		*
		* if (action == ACTION_SCROLL_UP.getId()) {
		* // Implement logic in a separate method.
		* navigateToPreviousMonth();
		*
		* return true;
		* } else if (action == ACTION_SCROLL_DOWN.getId()) {
		* // Implement logic in a separate method.
		* navigateToNextMonth();
		*
		* return true;
		* } else {
		* return false;
		* }
		* }
		* };
		* }
		* }
		* </pre></section></div></div>
		*/
		public abstract class AccessibilityNodeProvider {

packages/SystemUI/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -440,6 +440,9 @@
		<!-- Content description of the data connection type 5Ge. [CHAR LIMIT=NONE] -->
		<string name="data_connection_5ge" translate="false">5Ge</string>

		<!-- Content description of the data connection type 5Ge with HTML styling. DO NOT TRANSLATE [CHAR LIMIT=NONE] -->
		<string name="data_connection_5ge_html" translate="false"> <i>5G <small>E</small></i> </string>

		<!-- Content description of the data connection type 5G. [CHAR LIMIT=NONE] -->
		<string name="data_connection_5g" translate="false">5G</string>

packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -207,8 +207,9 @@ public class QSCarrierGroup extends LinearLayout implements
		public void setMobileDataIndicators(NetworkController.IconState statusIcon,
		NetworkController.IconState qsIcon, int statusType,
		int qsType, boolean activityIn, boolean activityOut,
		String typeContentDescription,
		String description, boolean isWide, int subId, boolean roaming) {
		CharSequence typeContentDescription,
		CharSequence typeContentDescriptionHtml, CharSequence description,
		boolean isWide, int subId, boolean roaming) {
		int slotIndex = getSlotIndex(subId);
		if (slotIndex >= SIM_SLOTS) {
		Log.w(TAG, "setMobileDataIndicators - slot: " + slotIndex);
		@@ -221,7 +222,7 @@ public class QSCarrierGroup extends LinearLayout implements
		mInfos[slotIndex].visible = statusIcon.visible;
		mInfos[slotIndex].mobileSignalIconId = statusIcon.icon;
		mInfos[slotIndex].contentDescription = statusIcon.contentDescription;
		mInfos[slotIndex].typeContentDescription = typeContentDescription;
		mInfos[slotIndex].typeContentDescription = typeContentDescription.toString();
		mInfos[slotIndex].roaming = roaming;
		handleUpdateState();
		}

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.res.Resources;
		import android.provider.Settings;
		import android.service.quicksettings.Tile;
		import android.telephony.SubscriptionManager;
		import android.text.Html;
		import android.text.TextUtils;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -206,12 +207,13 @@ public class CellularTile extends QSTileImpl<SignalState> {

		private CharSequence appendMobileDataType(CharSequence current, CharSequence dataType) {
		if (TextUtils.isEmpty(dataType)) {
		return current;
		return Html.fromHtml(current.toString(), 0);
		}
		if (TextUtils.isEmpty(current)) {
		return dataType;
		return Html.fromHtml(dataType.toString(), 0);
		}
		return mContext.getString(R.string.mobile_carrier_text_format, current, dataType);
		String concat = mContext.getString(R.string.mobile_carrier_text_format, current, dataType);
		return Html.fromHtml(concat, 0);
		}

		private CharSequence getMobileDataContentName(CallbackInfo cb) {
		@@ -252,14 +254,17 @@ public class CellularTile extends QSTileImpl<SignalState> {

		@Override
		public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType,
		int qsType, boolean activityIn, boolean activityOut, String typeContentDescription,
		String description, boolean isWide, int subId, boolean roaming) {
		int qsType, boolean activityIn, boolean activityOut,
		CharSequence typeContentDescription,
		CharSequence typeContentDescriptionHtml, CharSequence description,
		boolean isWide, int subId, boolean roaming) {
		if (qsIcon == null) {
		// Not data sim, don't display.
		return;
		}
		mInfo.dataSubscriptionName = mController.getMobileDataNetworkName();
		mInfo.dataContentDescription = (description != null) ? typeContentDescription : null;
		mInfo.dataContentDescription =
		(description != null) ? typeContentDescriptionHtml : null;
		mInfo.activityIn = activityIn;
		mInfo.activityOut = activityOut;
		mInfo.roaming = roaming;

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -177,8 +177,10 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba

		@Override
		public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType,
		int qsType, boolean activityIn, boolean activityOut, String typeContentDescription,
		String description, boolean isWide, int subId, boolean roaming) {
		int qsType, boolean activityIn, boolean activityOut,
		CharSequence typeContentDescription,
		CharSequence typeContentDescriptionHtml, CharSequence description,
		boolean isWide, int subId, boolean roaming) {
		MobileIconState state = getState(subId);
		if (state == null) {
		return;
		@@ -387,7 +389,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba
		public int typeId;
		public boolean roaming;
		public boolean needsLeadingPadding;
		public String typeContentDescription;
		public CharSequence typeContentDescription;

		private MobileIconState(int subId) {
		super();