diff options
author | Tony Wickham <twickham@google.com> | 2019-11-01 23:39:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-01 23:39:18 +0000 |
commit | d942b4208d258d7b80c557e2f82d9be1b81c7836 (patch) | |
tree | 4589128e1c2809bd6a18e7bb0fead79917f4610a /src/com/android | |
parent | c1fafebd472e96fb3a0bac924ae8a0db9172c874 (diff) | |
parent | 6894f4f1bb833822f335a01191cae2dfcf604fbc (diff) | |
download | packages_apps_Trebuchet-d942b4208d258d7b80c557e2f82d9be1b81c7836.tar.gz packages_apps_Trebuchet-d942b4208d258d7b80c557e2f82d9be1b81c7836.tar.bz2 packages_apps_Trebuchet-d942b4208d258d7b80c557e2f82d9be1b81c7836.zip |
Merge "Fix issue where popup jumps to full size before closing" into ub-launcher3-qt-future-dev
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/popup/ArrowPopup.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java index 28000b977..98f7fd853 100644 --- a/src/com/android/launcher3/popup/ArrowPopup.java +++ b/src/com/android/launcher3/popup/ArrowPopup.java @@ -360,10 +360,14 @@ public abstract class ArrowPopup extends AbstractFloatingView { final TimeInterpolator revealInterpolator = ACCEL_DEACCEL; // Rectangular reveal. + mEndRect.set(0, 0, getMeasuredWidth(), getMeasuredHeight()); final ValueAnimator revealAnim = createOpenCloseOutlineProvider() .createRevealAnimator(this, false); revealAnim.setDuration(revealDuration); revealAnim.setInterpolator(revealInterpolator); + // Clip the popup to the initial outline while the notification dot and arrow animate. + revealAnim.start(); + revealAnim.pause(); ValueAnimator fadeIn = ValueAnimator.ofFloat(0, 1); fadeIn.setDuration(revealDuration + arrowDuration); @@ -399,7 +403,6 @@ public abstract class ArrowPopup extends AbstractFloatingView { if (!mIsOpen) { return; } - mEndRect.setEmpty(); if (getOutlineProvider() instanceof RevealOutlineAnimation) { ((RevealOutlineAnimation) getOutlineProvider()).getOutline(mEndRect); } @@ -471,9 +474,6 @@ public abstract class ArrowPopup extends AbstractFloatingView { mStartRect.set(arrowCenterX - halfArrowWidth, arrowCenterY, arrowCenterX + halfArrowWidth, arrowCenterY); - if (mEndRect.isEmpty()) { - mEndRect.set(0, 0, getMeasuredWidth(), getMeasuredHeight()); - } return new RoundedRectRevealOutlineProvider (arrowCornerRadius, mOutlineRadius, mStartRect, mEndRect); |