Merge "[Flexiglass] Disable handling a11y scroll events in the NSSL" into main (84bcebb5) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -4172,6 +4172,11 @@ public class NotificationStackScrollLayout
		*/
		@Override
		public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
		// Don't handle scroll accessibility events from the NSSL, when SceneContainer enabled.
		if (SceneContainerFlag.isEnabled()) {
		return super.performAccessibilityActionInternal(action, arguments);
		}

		if (super.performAccessibilityActionInternal(action, arguments)) {
		return true;
		}
		@@ -4933,6 +4938,11 @@ public class NotificationStackScrollLayout
		@Override
		public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
		super.onInitializeAccessibilityEventInternal(event);
		// Don't handle scroll accessibility events from the NSSL, when SceneContainer enabled.
		if (SceneContainerFlag.isEnabled()) {
		return;
		}

		event.setScrollable(mScrollable);
		event.setMaxScrollX(mScrollX);
		event.setScrollY(mOwnScrollY);
		@@ -4942,6 +4952,11 @@ public class NotificationStackScrollLayout
		@Override
		public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfoInternal(info);
		// Don't handle scroll accessibility events from the NSSL, when SceneContainer enabled.
		if (SceneContainerFlag.isEnabled()) {
		return;
		}

		if (mScrollable) {
		info.setScrollable(true);
		if (mBackwardScrollable) {