Merge "add directional scroll for accessibility action in NumberPicker" (c526ef72) · Commits · e / os / android_frameworks_base

core/java/android/widget/NumberPicker.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -2558,14 +2558,16 @@ public class NumberPicker extends LinearLayout {
		}
		return false;
		}
		case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: {
		case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD:
		case R.id.accessibilityActionScrollDown: {
		if (NumberPicker.this.isEnabled()
		&& (getWrapSelectorWheel() \|\| getValue() < getMaxValue())) {
		changeValueByOne(true);
		return true;
		}
		} return false;
		case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: {
		case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD:
		case R.id.accessibilityActionScrollUp: {
		if (NumberPicker.this.isEnabled()
		&& (getWrapSelectorWheel() \|\| getValue() > getMinValue())) {
		changeValueByOne(false);
		@@ -2867,10 +2869,13 @@ public class NumberPicker extends LinearLayout {
		}
		if (NumberPicker.this.isEnabled()) {
		if (getWrapSelectorWheel() \|\| getValue() < getMaxValue()) {
		info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
		info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_FORWARD);
		info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_DOWN);
		}
		if (getWrapSelectorWheel() \|\| getValue() > getMinValue()) {
		info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
		info.addAction(
		AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_BACKWARD);
		info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_UP);
		}
		}