commit 079003b44d582bd1962061edcac02f58e711da30
author Zak Cohen <zakcohen@google.com> Mon Apr 26 23:59:07 2021 +0000
committer Zak Cohen <zakcohen@google.com> Mon Apr 26 23:59:07 2021 +0000
tree 2c58a0cedbd7a25c8126e72b798ed965c7685680
parent 8c383f97e4537c24affd0cd01631047509da2908

Revert "[Search][Motion] Separate AllApps scrim and content interpolation"

This reverts commit 8c383f97e4537c24affd0cd01631047509da2908.

Reason for revert: ScrimView is used in multiple places, Overview is broken by this change.

Change-Id: Ie395e2d94feaca4c9365bb5da68e9dc219990e03

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 36d3625..a54c791 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1197,7 +1197,7 @@
 
         // Setup the drag controller (drop targets have to be added in reverse order in priority)
         mDropTargetBar.setup(mDragController);
-        mAllAppsController.setupViews(mAppsView, mScrimView);
+        mAllAppsController.setupViews(mAppsView);
     }
 
     /**