Merge "Update divider swap a11y strings" into main (69022fad) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/res/values/strings.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,8 @@
		<!-- Accessibility action for moving docked stack divider to make the right screen full screen [CHAR LIMIT=NONE] -->
		<string name="accessibility_action_divider_right_full">Right full screen</string>
		<!-- Accessibility action for swapping the apps around the divider (double tap action) [CHAR LIMIT=NONE] -->
		<string name="accessibility_action_divider_swap">Swap Apps</string>
		<string name="accessibility_action_divider_swap_vertical">Swap top app with bottom</string>
		<string name="accessibility_action_divider_swap_horizontal">Swap left app with right</string>

		<!-- Accessibility action for moving docked stack divider to make the top screen full screen [CHAR LIMIT=NONE] -->
		<string name="accessibility_action_divider_top_full">Top full screen</string>

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -130,8 +130,6 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
		public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfo(host, info);
		final DividerSnapAlgorithm snapAlgorithm = mSplitLayout.mDividerSnapAlgorithm;
		info.addAction(new AccessibilityAction(R.id.action_swap_apps,
		mContext.getString(R.string.accessibility_action_divider_swap)));
		if (mSplitLayout.isLeftRightSplit()) {
		info.addAction(new AccessibilityAction(R.id.action_move_tl_full,
		mContext.getString(R.string.accessibility_action_divider_left_full)));
		@@ -150,6 +148,8 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
		}
		info.addAction(new AccessibilityAction(R.id.action_move_rb_full,
		mContext.getString(R.string.accessibility_action_divider_right_full)));
		info.addAction(new AccessibilityAction(R.id.action_swap_apps,
		mContext.getString(R.string.accessibility_action_divider_swap_horizontal)));
		} else {
		info.addAction(new AccessibilityAction(R.id.action_move_tl_full,
		mContext.getString(R.string.accessibility_action_divider_top_full)));
		@@ -168,6 +168,8 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
		}
		info.addAction(new AccessibilityAction(R.id.action_move_rb_full,
		mContext.getString(R.string.accessibility_action_divider_bottom_full)));
		info.addAction(new AccessibilityAction(R.id.action_swap_apps,
		mContext.getString(R.string.accessibility_action_divider_swap_vertical)));
		}
		}