commit db202abe4ede49897fb0fbf97dbd4d507bb069b6
author Samuel Fufa <sfufa@google.com> Thu Sep 26 17:38:25 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 26 17:38:25 2019 -0700
tree 1fc208e5b373c9b052c8e785317d52004584f8d8
parent 703d47e78b9c6b3ab5986ed970426df2c803309f
parent d69327e9c0bccc5d331d01ebf2c4693d550af570

Merge "Fix ScrimView caret alignment and ignore touches" into ub-launcher3-qt-future-dev
am: d69327e9c0

Change-Id: Ia19d766bdeb5d2a4023b1c408bddfe30e4de4dac

quickstep/src/com/android/quickstep/views/ShelfScrimView.java

diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index dc6b56e..26e9eaf 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -161,7 +161,7 @@
                 mMidProgress =  OVERVIEW.getVerticalProgress(mLauncher);
                 Rect hotseatPadding = dp.getHotseatLayoutPadding();
                 int hotseatSize = dp.hotseatBarSizePx + dp.getInsets().bottom
-                        - hotseatPadding.bottom - hotseatPadding.top;
+                        + hotseatPadding.bottom + hotseatPadding.top;
                 float dragHandleTop =
                         Math.min(hotseatSize, OverviewState.getDefaultSwipeHeight(context, dp));
                 mDragHandleProgress =  1 - (dragHandleTop / mShiftRange);

src/com/android/launcher3/views/ScrimView.java

diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index da1df3f..9f59d78 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -288,6 +288,7 @@
             anim.addUpdateListener((v) -> invalidate(invalidateRegion));
             getOverlay().add(drawable);
             anim.start();
+            return true;
         }
         return value;
     }