From d0937610f94833e0c3113418bd9092921042a4fe Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Fri, 27 Jun 2025 11:18:58 -0700 Subject: [PATCH] Revert "Remove ScrimView's drawing controller when resetting All Apps." This reverts commit 288006fe11bdaec4bd229999619dd7097806620a. Reason for revert: b/428195031 Bug: 426397329 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f9c3fd3eba6150092e2b1867428e0e5744af00c3) Merged-In: I58b58e35276a57ffe2e8d9a1f8c916e5d1be9eb0 Change-Id: I58b58e35276a57ffe2e8d9a1f8c916e5d1be9eb0 --- .../launcher3/allapps/ActivityAllAppsContainerView.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index c97c4edf90..1b92cfad32 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -116,6 +116,7 @@ public class ActivityAllAppsContainerView OnDeviceProfileChangeListener, PersonalWorkSlidingTabStrip.OnActivePageChangedListener, ScrimView.ScrimDrawingController { + private static final String TAG = "ActivityAllAppsContainerView"; public static final float PULL_MULTIPLIER = .02f; public static final float FLING_VELOCITY_MULTIPLIER = 1200f; @@ -506,10 +507,6 @@ public class ActivityAllAppsContainerView if (isSearching()) { mWorkManager.reset(); } - // Remove the scrim drawing controller to: - // 1) clean up its reference to this class; and - // 2) avoid using the unfolded version of this class for the folded screen or vice-versa - mScrimView.setDrawingController(null); } /**