diff options
author | Tony Wickham <twickham@google.com> | 2019-07-24 12:57:34 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-24 12:57:34 -0700 |
commit | 503575a9e4591004ee2c0d5e5ae503f56f1fe6ce (patch) | |
tree | 8674c3c1eb82351326bcc65a021367d3a866bea4 | |
parent | 6d9eed757faba32a775393b3dbb65ec8109fe456 (diff) | |
parent | cfbdb91a7fc6d510367aa6d8863cfb604238afce (diff) | |
download | android_packages_apps_Trebuchet-503575a9e4591004ee2c0d5e5ae503f56f1fe6ce.tar.gz android_packages_apps_Trebuchet-503575a9e4591004ee2c0d5e5ae503f56f1fe6ce.tar.bz2 android_packages_apps_Trebuchet-503575a9e4591004ee2c0d5e5ae503f56f1fe6ce.zip |
Merge "Distinguish mDragHandleProgress from mMidProgress" into ub-launcher3-qt-r1-dev
am: cfbdb91a7f
Change-Id: Id41c02c6543a4b0a12fc364e5c8e41dd6ccf9fc1
-rw-r--r-- | quickstep/src/com/android/quickstep/views/ShelfScrimView.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java index 63c8023f6..5a2f5c162 100644 --- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java +++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java @@ -74,6 +74,9 @@ public class ShelfScrimView extends ScrimView implements NavigationModeChangeLis private int mMidAlpha; private float mMidProgress; + // The progress at which the drag handle starts moving up with the shelf. + private float mDragHandleProgress; + private Interpolator mBeforeMidProgressColorInterpolator = ACCEL; private Interpolator mAfterMidProgressColorInterpolator = ACCEL; @@ -150,15 +153,16 @@ public class ShelfScrimView extends ScrimView implements NavigationModeChangeLis if ((OVERVIEW.getVisibleElements(mLauncher) & ALL_APPS_HEADER_EXTRA) == 0) { mMidProgress = 1; + mDragHandleProgress = 1; mMidAlpha = 0; } else { mMidAlpha = Themes.getAttrInteger(getContext(), R.attr.allAppsInterimScrimAlpha); + mMidProgress = OVERVIEW.getVerticalProgress(mLauncher); Rect hotseatPadding = dp.getHotseatLayoutPadding(); int hotseatSize = dp.hotseatBarSizePx + dp.getInsets().bottom - hotseatPadding.bottom - hotseatPadding.top; - float arrowTop = Math.min(hotseatSize, OverviewState.getDefaultSwipeHeight(dp)); - mMidProgress = 1 - (arrowTop / mShiftRange); - + float dragHandleTop = Math.min(hotseatSize, OverviewState.getDefaultSwipeHeight(dp)); + mDragHandleProgress = 1 - (dragHandleTop / mShiftRange); } mTopOffset = dp.getInsets().top - mShelfOffset; mShelfTopAtThreshold = mShiftRange * SCRIM_CATCHUP_THRESHOLD + mTopOffset; @@ -199,8 +203,6 @@ public class ShelfScrimView extends ScrimView implements NavigationModeChangeLis mProgress, mMidProgress, 1, mMidAlpha, 0, mBeforeMidProgressColorInterpolator)); mShelfColor = setColorAlphaBound(mEndScrim, alpha); } else { - mDragHandleOffset += mShiftRange * (mMidProgress - mProgress); - // Note that these ranges and interpolators are inverted because progress goes 1 to 0. int alpha = Math.round( Utilities.mapToRange(mProgress, (float) 0, mMidProgress, (float) mEndAlpha, @@ -212,6 +214,10 @@ public class ShelfScrimView extends ScrimView implements NavigationModeChangeLis (float) 0, LINEAR)); mRemainingScreenColor = setColorAlphaBound(mScrimColor, remainingScrimAlpha); } + + if (mProgress < mDragHandleProgress) { + mDragHandleOffset += mShiftRange * (mDragHandleProgress - mProgress); + } } @Override |