commit 65a2aa86dbd90aca8653c1567c2f73fe957981fc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 11 01:01:26 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 11 01:01:26 2017 +0000
tree 4fbc61a909cc36c17e9de3e1e6590be71b8ca363
parent 89c719e8a36379144afe2a9b6ad6bc9fcea32f0a
parent 6dea7cddf9c79d5acbc1f94219a3f1df1bc86348

Merge "Mark off-screen pages as unimportant for accessibility" into ub-launcher3-dorval-polish

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 063a9a2..3b11619 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1632,16 +1632,21 @@
     }
 
     private void updatePageAlphaValues() {
-        if (mWorkspaceFadeInAdjacentScreens &&
-                !workspaceInModalState() &&
-                !mIsSwitchingState) {
+        if (!workspaceInModalState() && !mIsSwitchingState) {
             int screenCenter = getScrollX() + getViewportWidth() / 2;
             for (int i = numCustomPages(); i < getChildCount(); i++) {
                 CellLayout child = (CellLayout) getChildAt(i);
                 if (child != null) {
                     float scrollProgress = getScrollProgress(screenCenter, child, i);
                     float alpha = 1 - Math.abs(scrollProgress);
-                    child.getShortcutsAndWidgets().setAlpha(alpha);
+                    if (mWorkspaceFadeInAdjacentScreens) {
+                        child.getShortcutsAndWidgets().setAlpha(alpha);
+                    } else {
+                        // Pages that are off-screen aren't important for accessibility.
+                        child.getShortcutsAndWidgets().setImportantForAccessibility(
+                                alpha > 0 ? IMPORTANT_FOR_ACCESSIBILITY_AUTO
+                                        : IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
+                    }
                 }
             }
         }