commit 262a3542f8e48a575b02ec75d5727a800f9d2c2b
author Wei Sheng Shih <wilsonshih@google.com> Wed Jun 02 10:07:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 02 10:07:22 2021 +0000
tree 45ef20e00b1a938f5aa550ca7e4e37f1c5277ab2
parent 8495b3af1be349ed5cb40b46cd44f1aec45c68ef
parent 630efccd7ad8e35a1b12125b17b6cf96ffe65c32

Merge "Read the starting surface icon size from framework" into sc-dev am: 630efccd7a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14609921

Change-Id: I975ebe8cc084bf2bd5b1c521bbdc48bfa45dd4b6

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 42baa65..36322ce 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1409,14 +1409,14 @@
                     : APP_LAUNCH_ALPHA_DOWN_DURATION;
             iconAlphaStart = hasSplashScreen && !hasDifferentAppIcon ? 0 : 1f;
 
-            // TOOD: Share value from shell when available.
-            final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics());
+            final int windowIconSize = ResourceUtils.getDimenByName("starting_surface_icon_size",
+                    r, 108);
 
             cropCenterXStart = windowTargetBounds.centerX();
             cropCenterYStart = windowTargetBounds.centerY();
 
-            cropWidthStart = (int) windowIconSize;
-            cropHeightStart = (int) windowIconSize;
+            cropWidthStart = windowIconSize;
+            cropHeightStart = windowIconSize;
 
             cropWidthEnd = windowTargetBounds.width();
             cropHeightEnd = windowTargetBounds.height();