From cf0ef6e5620bc43e9d656620074560a4bf46fc94 Mon Sep 17 00:00:00 2001 From: Suphon Thanakornpakapong Date: Fri, 29 Oct 2021 01:06:41 +0700 Subject: [PATCH] Fix PagedView crash below Q --- src/com/android/launcher3/PagedView.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 3d3eafdfdc..478324c05b 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1649,17 +1649,21 @@ public abstract class PagedView extends ViewGrou info.addAction(pagesFlipped ? AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_BACKWARD : AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_FORWARD); - info.addAction(mIsRtl ? - AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_LEFT - : AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_RIGHT); + if (Utilities.ATLEAST_Q) { + info.addAction(mIsRtl ? + AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_LEFT + : AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_RIGHT); + } } if (getCurrentPage() >= offset) { info.addAction(pagesFlipped ? AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_FORWARD : AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_BACKWARD); - info.addAction(mIsRtl ? - AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_RIGHT - : AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_LEFT); + if (Utilities.ATLEAST_Q) { + info.addAction(mIsRtl ? + AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_RIGHT + : AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_LEFT); + } } // Accessibility-wise, PagedView doesn't support long click, so disabling it. // Besides disabling the accessibility long-click, this also prevents this view from getting