From 776443b3370f9969e2a454f278b77357e2b557f9 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Fri, 10 Sep 2021 18:27:53 -0700 Subject: [PATCH] [AllApps] NORMAL <-> ALL_APPS motion clean fixes for AOSP - Avoids drawing on scrim when headerProtection is not enabled. - Defines a default staggered animation for all apps scrim and content per S design guidelines [preview attached to bug] Bug: 191259805 Test: visual Change-Id: I0d625c9f0caba158ff58f12a39b4f18aedead84b --- .../allapps/AllAppsContainerView.java | 1 + .../allapps/AllAppsTransitionController.java | 5 +-- .../touch/AllAppsSwipeController.java | 37 +++++++++++++++++-- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index e779ee80ea..12c8d38252 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -711,6 +711,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo @Override public void drawOnScrim(Canvas canvas) { + if (!mHeader.isHeaderProtectionSupported()) return; mHeaderPaint.setColor(mHeaderColor); mHeaderPaint.setAlpha((int) (getAlpha() * Color.alpha(mHeaderColor))); if (mHeaderPaint.getColor() != mScrimColor && mHeaderPaint.getColor() != 0) { diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index a0551f019a..36ae5bb7a6 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -37,7 +37,6 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorListeners; -import com.android.launcher3.anim.Interpolators; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.anim.PropertySetter; import com.android.launcher3.config.FeatureFlags; @@ -59,7 +58,6 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfileChangeListener { // This constant should match the second derivative of the animator interpolator. public static final float INTERP_COEFF = 1.7f; - private static final float CONTENT_VISIBLE_MAX_THRESHOLD = 0.5f; public static final FloatProperty ALL_APPS_PROGRESS = new FloatProperty("allAppsProgress") { @@ -181,8 +179,7 @@ public class AllAppsTransitionController int visibleElements = state.getVisibleElements(mLauncher); boolean hasAllAppsContent = (visibleElements & ALL_APPS_CONTENT) != 0; - Interpolator allAppsFade = config.getInterpolator(ANIM_ALL_APPS_FADE, - Interpolators.clampToProgress(LINEAR, 0, CONTENT_VISIBLE_MAX_THRESHOLD)); + Interpolator allAppsFade = config.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR); setter.setViewAlpha(mAppsView, hasAllAppsContent ? 1 : 0, allAppsFade); boolean shouldProtectHeader = diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java index ab2652ab5e..4894b3b08f 100644 --- a/src/com/android/launcher3/touch/AllAppsSwipeController.java +++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java @@ -1,5 +1,5 @@ -/** - * Copyright (C) 2019 The Android Open Source Project +/* + * Copyright (C) 2015 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,18 +17,31 @@ package com.android.launcher3.touch; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.NORMAL; +import static com.android.launcher3.anim.Interpolators.LINEAR; +import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE; +import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE; import android.view.MotionEvent; +import android.view.animation.Interpolator; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; +import com.android.launcher3.anim.Interpolators; +import com.android.launcher3.states.StateAnimationConfig; /** * TouchController to switch between NORMAL and ALL_APPS state. */ public class AllAppsSwipeController extends AbstractStateChangeTouchController { + private static final float ALLAPPS_STAGGERED_FADE_THRESHOLD = 0.5f; + + public static final Interpolator ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER = + Interpolators.clampToProgress(LINEAR, 0, ALLAPPS_STAGGERED_FADE_THRESHOLD); + public static final Interpolator ALLAPPS_STAGGERED_FADE_LATE_RESPONDER = + Interpolators.clampToProgress(LINEAR, ALLAPPS_STAGGERED_FADE_THRESHOLD, 1f); + public AllAppsSwipeController(Launcher l) { super(l, SingleAxisSwipeDetector.VERTICAL); } @@ -65,12 +78,28 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { @Override protected float initCurrentAnimation() { float range = getShiftRange(); - long maxAccuracy = (long) (2 * range); + StateAnimationConfig config = getConfigForStates(mFromState, mToState); + config.duration = (long) (2 * range); + mCurrentAnimation = mLauncher.getStateManager() - .createAnimationToNewWorkspace(mToState, maxAccuracy); + .createAnimationToNewWorkspace(mToState, config); float startVerticalShift = mFromState.getVerticalProgress(mLauncher) * range; float endVerticalShift = mToState.getVerticalProgress(mLauncher) * range; float totalShift = endVerticalShift - startVerticalShift; return 1 / totalShift; } + + @Override + protected StateAnimationConfig getConfigForStates(LauncherState fromState, + LauncherState toState) { + StateAnimationConfig config = super.getConfigForStates(fromState, toState); + if (fromState == NORMAL && toState == ALL_APPS) { + config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); + config.setInterpolator(ANIM_ALL_APPS_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); + } else if (fromState == ALL_APPS && toState == NORMAL) { + config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); + config.setInterpolator(ANIM_ALL_APPS_FADE, ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); + } + return config; + } }