diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-27 00:15:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-27 00:15:36 +0000 |
| commit | d69327e9c0bccc5d331d01ebf2c4693d550af570 (patch) | |
| tree | 37bc5da889ea27de66ec986ac094923a06d40ad0 | |
| parent | 12db478e464e42b78bf0c491eccb79e83c507cf2 (diff) | |
| parent | 0316d6cd7a911b8714ae151d96c537f5e3c2d3c1 (diff) | |
| download | packages_apps_Trebuchet-d69327e9c0bccc5d331d01ebf2c4693d550af570.tar.gz packages_apps_Trebuchet-d69327e9c0bccc5d331d01ebf2c4693d550af570.tar.bz2 packages_apps_Trebuchet-d69327e9c0bccc5d331d01ebf2c4693d550af570.zip | |
Merge "Fix ScrimView caret alignment and ignore touches" into ub-launcher3-qt-future-dev
| -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; } |