From aa2272f81cc4a62f847db777efda7959cc2b9979 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 22 Jun 2017 14:22:40 -0700 Subject: Popup visual changes - Don't remove elevation during animation (b/62905720) - Other adjustments (b/35766387) - Add "gutter" between notification and shortcuts - Change shortcuts to always be primary color (e.g. white) - Scale down shortcut icons when notifications present - Apply icon extracted color to "Notifications" header Change-Id: Idf791dc76d15d05d246000ad73810916d7cd1750 --- src/com/android/launcher3/folder/FolderAnimationManager.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/com/android/launcher3/folder') diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index 3648c60e1..80eb74d66 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -198,8 +198,14 @@ public class FolderAnimationManager { play(a, getAnimator(mFolder, SCALE_PROPERTY, initialScale, finalScale)); play(a, getAnimator(mFolderBackground, "color", initialColor, finalColor)); play(a, mFolderIcon.mFolderName.createTextAlphaAnimator(!mIsOpening)); - play(a, new RoundedRectRevealOutlineProvider(initialRadius, finalRadius, startRect, - endRect).createRevealAnimator(mFolder, !mIsOpening)); + RoundedRectRevealOutlineProvider outlineProvider = new RoundedRectRevealOutlineProvider( + initialRadius, finalRadius, startRect, endRect) { + @Override + public boolean shouldRemoveElevationDuringAnimation() { + return true; + } + }; + play(a, outlineProvider.createRevealAnimator(mFolder, !mIsOpening)); // Animate the elevation midway so that the shadow is not noticeable in the background. int midDuration = mDuration / 2; -- cgit v1.2.3