diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-07 00:46:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 00:46:09 +0000 |
commit | 8955190179f8f13f63cf61f24525b89339b085c7 (patch) | |
tree | c33a40bc9900a516f1c072c16de006d419c17887 | |
parent | 821d22ea66038e60bdcb34483971caad37b7ac00 (diff) | |
parent | f89aa3579a42f234b045546257b8e449e2c6fa8f (diff) | |
download | android_packages_apps_Trebuchet-8955190179f8f13f63cf61f24525b89339b085c7.tar.gz android_packages_apps_Trebuchet-8955190179f8f13f63cf61f24525b89339b085c7.tar.bz2 android_packages_apps_Trebuchet-8955190179f8f13f63cf61f24525b89339b085c7.zip |
Merge "Hiding workspace from accessibility when its not visible" into ub-launcher3-burnaby
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index fb0a54d3c..451f1245e 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1976,7 +1976,7 @@ public class Workspace extends PagedView public Animator setStateWithAnimation(State toState, int toPage, boolean animated, boolean hasOverlaySearchBar, HashMap<View, Integer> layerViews) { // Create the animation to the new state - Animator workspaceAnim = mStateTransitionAnimation.getAnimationToState(getState(), + Animator workspaceAnim = mStateTransitionAnimation.getAnimationToState(mState, toState, toPage, animated, hasOverlaySearchBar, layerViews); // Update the current state @@ -1996,6 +1996,9 @@ public class Workspace extends PagedView for (int i = numCustomPages(); i < total; i++) { updateAccessibilityFlags((CellLayout) getPageAt(i), i); } + setImportantForAccessibility((mState == State.NORMAL || mState == State.OVERVIEW) + ? IMPORTANT_FOR_ACCESSIBILITY_AUTO + : IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS); } else { int accessible = mState == State.NORMAL ? IMPORTANT_FOR_ACCESSIBILITY_AUTO : |