From 4c23cce276b0b467e2e1fc00b3fff5f6524a619f Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 16 Feb 2022 06:43:55 +0000 Subject: [PATCH] 1b/ Replace removed shared lib calls with direct calls Bug: 219861883 Test: Builds Change-Id: I7831d0de14286c9fa39fed59b168535e0a70d94d --- .../statehandlers/DepthController.java | 6 +++--- .../taskbar/TaskbarDragController.java | 18 ++++++++---------- ...skbarShortcutMenuAccessibilityDelegate.java | 4 +--- .../quickstep/QuickstepProcessInitializer.java | 6 +++--- .../com/android/quickstep/TaskIconCache.java | 12 ++++++++++-- .../android/quickstep/TaskShortcutFactory.java | 3 +-- .../src/com/android/quickstep/ViewUtils.java | 2 -- 7 files changed, 26 insertions(+), 25 deletions(-) diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java index d54b9e774b..3b02599ada 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java +++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java @@ -23,6 +23,7 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTR import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; +import android.app.WallpaperManager; import android.os.IBinder; import android.os.SystemProperties; import android.util.FloatProperty; @@ -42,7 +43,6 @@ import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.statemanager.StateManager.StateHandler; import com.android.launcher3.states.StateAnimationConfig; import com.android.systemui.shared.system.BlurUtils; -import com.android.systemui.shared.system.WallpaperManagerCompat; import java.io.PrintWriter; import java.util.function.Consumer; @@ -127,7 +127,7 @@ public class DepthController implements StateHandler, */ private int mMaxBlurRadius; private boolean mCrossWindowBlursEnabled; - private WallpaperManagerCompat mWallpaperManager; + private WallpaperManager mWallpaperManager; private SurfaceControl mSurface; /** * How visible the -1 overlay is, from 0 to 1. @@ -168,7 +168,7 @@ public class DepthController implements StateHandler, private void ensureDependencies() { if (mWallpaperManager == null) { mMaxBlurRadius = mLauncher.getResources().getInteger(R.integer.max_depth_blur_radius); - mWallpaperManager = new WallpaperManagerCompat(mLauncher); + mWallpaperManager = mLauncher.getSystemService(WallpaperManager.class); } if (mLauncher.getRootView() != null && mOnAttachListener == null) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java index 435eae47ee..77905525a5 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java @@ -66,8 +66,6 @@ import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider; import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.system.ClipDescriptionCompat; -import com.android.systemui.shared.system.LauncherAppsCompat; import java.io.PrintWriter; import java.util.Arrays; @@ -315,13 +313,13 @@ public class TaskbarDragController extends DragController