Merging ub-launcher3-qt-dev, build 5456758

Test: Manual

Bug:111142970 Icon display blur in all apps page
Bug:114136250 Have a more spartan RecentsActivity on android go
Bug:122609330 Update PIP animation for swiping up to home
Bug:123985787 Respect dialogCornerRadius for all apps / widgets / settings / shortcut menu / dwb / task / overview (everything)
Bug:126587956 Create an app to use with Launcher testing
Bug:126606858 In multiwindow mode, not able to switch between recent apps.
Bug:127766994 Gray app icons disappeared after completing cable transfer for a while
Bug:127987071 Create a proper contract for specifying default Launcher Layout
Bug:129033091 [Q-Preview] I would like the ability to swipe up anywhere on my screen to open up the app li.
Bug:129297464 [Gesture Nav] Exclude edges from most Launcher / Overview states.
Bug:129434166 Lab-only flake: drag to workspace doesn't happen
Bug:129746879 [Q-Preview] Quick search bar overlaying other app
Bug:129874298 Show different string (Wallpaper vs Style & Wallpaper) on Settings depending on device type
Bug:129947426 nexus launcher crash observed randomly during device boot up(NPE:Attempt to invoke virtual method 'android.app.ActivityManager$RunningTaskInfo com.android.systemui.shared.system.ActivityManagerWrapper.getRunningTask(int)' on a null object reference)
Bug:129976669 Implement returning to home from Widgets in 0-button mode Bug:130027168 Can't tap in nav region on home screen
Bug:130151609 Some tests in MultiDisplaySystemDecorationTests.java failing in pre-submit
Bug:130182878 Pixel launcher crashes on secondary display
Bug:130225926 Cannot unpin app while in gesture nav
Bug:130245920 Icons disappear from launcher when selected
Bug:130272454 [C1/B1] Message app crash when opening a video MMS.
Change-Id: I18aa35d2c75deaf5149358d96d4e1d7f26de2f02

1 files changed, 6 insertions, 6 deletions

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
index e1a39c64b..32d510dd2 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -16,6 +16,8 @@
 package com.android.quickstep.util;
 
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;
+import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
@@ -33,6 +35,7 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.views.RecentsView;
@@ -97,12 +100,9 @@ public class ClipAnimationHelper {
             (t, a1) -> a1;
 
     public ClipAnimationHelper(Context context) {
-        mWindowCornerRadius = RecentsModel.INSTANCE.get(context).getWindowCornerRadius();
-        mSupportsRoundedCornersOnWindows = RecentsModel.INSTANCE.get(context)
-                .supportsRoundedCornersOnWindows();
-        int taskCornerRadiusRes = mSupportsRoundedCornersOnWindows ?
-                R.dimen.task_corner_radius : R.dimen.task_corner_radius_small;
-        mTaskCornerRadius = context.getResources().getDimension(taskCornerRadiusRes);
+        mWindowCornerRadius = getWindowCornerRadius(context.getResources());
+        mSupportsRoundedCornersOnWindows = supportsRoundedCornersOnWindows(context.getResources());
+        mTaskCornerRadius = Themes.getDialogCornerRadius(context);
     }
 
     private void updateSourceStack(RemoteAnimationTargetCompat target) {