commit 630efccd7ad8e35a1b12125b17b6cf96ffe65c32
author Wei Sheng Shih <wilsonshih@google.com> Wed Jun 02 10:00:22 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 02 10:00:22 2021 +0000
tree d8d4df1762cc90ce37e66b7057af13500bc79b2d
parent b177133e7b74fe2853aac2fb1608987131a08dca
parent 1bcb9d94ce036f85a6e6657fb8b51c400ec5a531

Merge "Read the starting surface icon size from framework" into sc-dev

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