From 5d1873a812297ad207df1f068a987d2dd84a9888 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 8 May 2018 11:10:44 -0700 Subject: Removing scrim overdraw > Moving all the scrims to draglayer to avoid creating multiple layers during various animations > Removing sys-ui scrim in various states which alread have a background scrim Bug: 74556464 Bug: 78585335 Change-Id: I8a3fd34ed440f3c7d2e19b3cdb4b72723c535602 --- .../android/launcher3/WorkspaceStateTransitionAnimation.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3/WorkspaceStateTransitionAnimation.java') diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index d6b234934..9f26e4a78 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -21,6 +21,8 @@ import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; import static com.android.launcher3.LauncherState.HOTSEAT_ICONS; import static com.android.launcher3.LauncherState.HOTSEAT_SEARCH_BOX; import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; +import static com.android.launcher3.graphics.WorkspaceAndHotseatScrim.SCRIM_PROGRESS; +import static com.android.launcher3.graphics.WorkspaceAndHotseatScrim.SYSUI_PROGRESS; import android.view.View; import android.view.animation.Interpolator; @@ -30,7 +32,7 @@ import com.android.launcher3.LauncherStateManager.AnimationConfig; import com.android.launcher3.anim.AnimatorSetBuilder; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.anim.PropertySetter; -import com.android.launcher3.graphics.ViewScrim; +import com.android.launcher3.graphics.WorkspaceAndHotseatScrim; /** * Manages the animations between each of the workspace states. @@ -103,8 +105,11 @@ public class WorkspaceStateTransitionAnimation { pageAlphaProvider.interpolator); // Set scrim - propertySetter.setFloat(ViewScrim.get(mWorkspace), ViewScrim.PROGRESS, - state.getWorkspaceScrimAlpha(mLauncher), Interpolators.LINEAR); + WorkspaceAndHotseatScrim scrim = mLauncher.getDragLayer().getScrim(); + propertySetter.setFloat(scrim, SCRIM_PROGRESS, state.getWorkspaceScrimAlpha(mLauncher), + Interpolators.LINEAR); + propertySetter.setFloat(scrim, SYSUI_PROGRESS, state.hasSysUiScrim ? 1 : 0, + Interpolators.LINEAR); } public void applyChildState(LauncherState state, CellLayout cl, int childIndex) { -- cgit v1.2.3