Update the snap targets in minimized mode to reflect the correct targets (4ef6ed96) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/DividerSnapAlgorithm.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -370,6 +370,14 @@ public class DividerSnapAlgorithm {
		return snapTarget;
		}

		/**
		* @return whether or not there are more than 1 split targets that do not include the two
		* dismiss targets, used in deciding to display the middle target for accessibility
		*/
		public boolean showMiddleSplitTargetForAccessibility() {
		return (mTargets.size() - 2) > 1;
		}

		public boolean isFirstSplitTargetAvailable() {
		return mFirstSplitTarget != mMiddleTarget;
		}

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -180,16 +180,20 @@ public class DividerView extends FrameLayout implements OnTouchListener,
		@Override
		public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfo(host, info);
		final DividerSnapAlgorithm snapAlgorithm = getSnapAlgorithm();
		if (isHorizontalDivision()) {
		info.addAction(new AccessibilityAction(R.id.action_move_tl_full,
		mContext.getString(R.string.accessibility_action_divider_top_full)));
		if (mSnapAlgorithm.isFirstSplitTargetAvailable()) {
		if (snapAlgorithm.isFirstSplitTargetAvailable()) {
		info.addAction(new AccessibilityAction(R.id.action_move_tl_70,
		mContext.getString(R.string.accessibility_action_divider_top_70)));
		}
		if (snapAlgorithm.showMiddleSplitTargetForAccessibility()) {
		// Only show the middle target if there are more than 1 split target
		info.addAction(new AccessibilityAction(R.id.action_move_tl_50,
		mContext.getString(R.string.accessibility_action_divider_top_50)));
		if (mSnapAlgorithm.isLastSplitTargetAvailable()) {
		}
		if (snapAlgorithm.isLastSplitTargetAvailable()) {
		info.addAction(new AccessibilityAction(R.id.action_move_tl_30,
		mContext.getString(R.string.accessibility_action_divider_top_30)));
		}
		@@ -198,13 +202,16 @@ public class DividerView extends FrameLayout implements OnTouchListener,
		} else {
		info.addAction(new AccessibilityAction(R.id.action_move_tl_full,
		mContext.getString(R.string.accessibility_action_divider_left_full)));
		if (mSnapAlgorithm.isFirstSplitTargetAvailable()) {
		if (snapAlgorithm.isFirstSplitTargetAvailable()) {
		info.addAction(new AccessibilityAction(R.id.action_move_tl_70,
		mContext.getString(R.string.accessibility_action_divider_left_70)));
		}
		if (snapAlgorithm.showMiddleSplitTargetForAccessibility()) {
		// Only show the middle target if there are more than 1 split target
		info.addAction(new AccessibilityAction(R.id.action_move_tl_50,
		mContext.getString(R.string.accessibility_action_divider_left_50)));
		if (mSnapAlgorithm.isLastSplitTargetAvailable()) {
		}
		if (snapAlgorithm.isLastSplitTargetAvailable()) {
		info.addAction(new AccessibilityAction(R.id.action_move_tl_30,
		mContext.getString(R.string.accessibility_action_divider_left_30)));
		}