commit 10247d75c53600ae8ce4baaf8fb7e71276ff726c
author Wei Sheng Shih <wilsonshih@google.com> Wed Jun 02 10:23:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 02 10:23:40 2021 +0000
tree 41a46f5764b923f09c43519ef4696023fe23fd36
parent 3b381a35f79ebe4fb19bf77105864fe45fad3026
parent 7f9488dcf29b319dad932661344d88934fc0f2e3

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

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

Change-Id: Ie510c9d639d88b207f56e7ba95e262014daced81

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();