diff options
author | Samuel Fufa <sfufa@google.com> | 2019-09-26 16:30:42 -0700 |
---|---|---|
committer | Samuel Fufa <sfufa@google.com> | 2019-09-26 16:30:46 -0700 |
commit | 0316d6cd7a911b8714ae151d96c537f5e3c2d3c1 (patch) | |
tree | 66f76478d21e3c5c8ced0118c25a8eb405962186 | |
parent | c50fe371b16e903eefa33196703b710042b107e2 (diff) | |
download | packages_apps_Trebuchet-0316d6cd7a911b8714ae151d96c537f5e3c2d3c1.tar.gz packages_apps_Trebuchet-0316d6cd7a911b8714ae151d96c537f5e3c2d3c1.tar.bz2 packages_apps_Trebuchet-0316d6cd7a911b8714ae151d96c537f5e3c2d3c1.zip |
Fix ScrimView caret alignment and ignore touches
Test:Manual
Bug:79868152
Change-Id: Idd5a2b965173b8071697b50aac8760b0d84e469f
-rw-r--r-- | quickstep/src/com/android/quickstep/views/ShelfScrimView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/views/ScrimView.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java index dc6b56eec..26e9eaf01 100644 --- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java +++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java @@ -161,7 +161,7 @@ public class ShelfScrimView extends ScrimView implements NavigationModeChangeLis 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); diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java index da1df3f89..9f59d7821 100644 --- a/src/com/android/launcher3/views/ScrimView.java +++ b/src/com/android/launcher3/views/ScrimView.java @@ -288,6 +288,7 @@ public class ScrimView extends View implements Insettable, OnChangeListener, anim.addUpdateListener((v) -> invalidate(invalidateRegion)); getOverlay().add(drawable); anim.start(); + return true; } return value; } |