commit aeb1643ec61af93453c862e84b158d3b0ebcb1c7
author Sunny Goyal <sunnygoyal@google.com> Mon Oct 16 11:46:41 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Tue Oct 17 12:42:08 2017 -0700
tree b57dcdc0892a153cb83333a2dab55547e7d87665
parent 1797af41d162413dc98c33fab8ba19f96b63874b

Launcher state management cleanup

> Removing Widgets and related states
> Fixing different durations being used when opening/closing all-apps
> Removing some unnecessary object allocations when changing state without animation
> Differentiating widget bootm sheel and full sheet in logs

Bug: 67678570
Change-Id: Ic169528736d04ee0b38564b4f96595ba066eabda

src/com/android/launcher3/PinchAnimationManager.java

diff --git a/src/com/android/launcher3/PinchAnimationManager.java b/src/com/android/launcher3/PinchAnimationManager.java
index c3d3bb3..10f35bd 100644
--- a/src/com/android/launcher3/PinchAnimationManager.java
+++ b/src/com/android/launcher3/PinchAnimationManager.java
@@ -75,8 +75,7 @@
 
         mOverviewScale = mWorkspace.getOverviewModeShrinkFactor();
         mOverviewTranslationY = mWorkspace.getOverviewModeTranslationY();
-        mNormalOverviewTransitionDuration = mWorkspace.getStateTransitionAnimation()
-                .mOverviewTransitionTime;
+        mNormalOverviewTransitionDuration = LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
     }
 
     public int getNormalOverviewTransitionDuration() {
@@ -131,7 +130,8 @@
         mWorkspace.setScaleX(interpolatedScale);
         mWorkspace.setScaleY(interpolatedScale);
         mWorkspace.setTranslationY(interpolatedTranslationY);
-        setOverviewPanelsAlpha(1f - interpolatedProgress, 0);
+        int alpha = (int) ((1f - interpolatedProgress) * 255);
+        setOverviewPanelsAlpha(alpha, 0);
     }
 
     /**
@@ -180,14 +180,15 @@
         }
     }
 
-    private void setOverviewPanelsAlpha(float alpha, int duration) {
+    private void setOverviewPanelsAlpha(int alpha, int duration) {
         int childCount = mWorkspace.getChildCount();
         for (int i = 0; i < childCount; i++) {
             final CellLayout cl = (CellLayout) mWorkspace.getChildAt(i);
             if (duration == 0) {
-                cl.setBackgroundAlpha(alpha);
+                cl.getScrimBackground().setAlpha(alpha);
             } else {
-                ObjectAnimator.ofFloat(cl, "backgroundAlpha", alpha).setDuration(duration).start();
+                ObjectAnimator.ofInt(cl.getScrimBackground(),
+                        LauncherAnimUtils.DRAWABLE_ALPHA, alpha).setDuration(duration).start();
             }
         }
     }
@@ -202,9 +203,9 @@
     }
 
     private void animateScrim(boolean show) {
-        float endValue = show ? mWorkspace.getStateTransitionAnimation().mWorkspaceScrimAlpha : 0;
-        startAnimator(INDEX_SCRIM,
-                ObjectAnimator.ofFloat(mLauncher.getDragLayer(), "backgroundAlpha", endValue),
+        int endValue = show ? mWorkspace.getStateTransitionAnimation().mWorkspaceScrimAlpha : 0;
+        startAnimator(INDEX_SCRIM, ObjectAnimator.ofInt(
+                mLauncher.getDragLayer().getScrim(), LauncherAnimUtils.DRAWABLE_ALPHA, endValue),
                 mNormalOverviewTransitionDuration);
     }