commit ccf125c31b4ba89c0e50542ab51ed036d9391e8b
author Wei Sheng Shih <wilsonshih@google.com> Wed Jun 02 10:40:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 02 10:40:38 2021 +0000
tree aadbeba5a6e8561701607a96b7f7fb164bc69a97
parent c3dd4c45dbd9b08c3c626f41e49d8951a2efe29e
parent 10247d75c53600ae8ce4baaf8fb7e71276ff726c

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

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

Change-Id: I76961f5f5ef54f6218471034aab5d13b680945c0

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 34c08d6..43d03b3 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1416,14 +1416,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();