commit 07b8b0b1f091ef7de2a8b706f90f503298932658
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 16 22:51:44 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 16 22:51:44 2018 +0000
tree 40ca4a3ccec84ecf2199bb03f58836f7d1b20da6
parent 2c27df5b5d33076758e7a62388f80ea3ea6f0e19
parent 8d994cd6d503b2c281e7da253798b6f80f9e26c6

Merge "Fix bug where Workspace page alpha stays 0 in SpringLoaded mode." into ub-launcher3-edmonton

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a03a7a8..2df34d5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1297,7 +1297,9 @@
     }
 
     private void updatePageAlphaValues() {
-        if (!workspaceInModalState() && !mIsSwitchingState) {
+        // We need to check the isDragging case because updatePageAlphaValues is called between
+        // goToState(SPRING_LOADED) and onStartStateTransition.
+        if (!workspaceInModalState() && !mIsSwitchingState && !mDragController.isDragging()) {
             int screenCenter = getScrollX() + getMeasuredWidth() / 2;
             for (int i = 0; i < getChildCount(); i++) {
                 CellLayout child = (CellLayout) getChildAt(i);