Loading quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +9 −23 Original line number Diff line number Diff line Loading @@ -564,7 +564,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener // Set the crop here so we can calculate the corner radius below. crop.set(left, top, right, bottom); RectF targetBounds = new RectF(windowTargetBounds); RectF floatingIconBounds = new RectF(); RectF tmpRectF = new RectF(); Point tmpPos = new Point(); Loading Loading @@ -653,12 +652,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener tmpRectF.offset(dragLayerBounds[0], dragLayerBounds[1]); tmpRectF.offset(mDx.value, mDy.value); Utilities.scaleRectFAboutCenter(tmpRectF, mIconScaleToFitScreen.value); float windowTransX0 = tmpRectF.left - offsetX; float windowTransY0 = tmpRectF.top - offsetY; if (hasSplashScreen) { windowTransX0 -= crop.left * scale; windowTransY0 -= crop.top * scale; } float windowTransX0 = tmpRectF.left - offsetX - crop.left * scale; float windowTransY0 = tmpRectF.top - offsetY - crop.top * scale; // Calculate the icon position. floatingIconBounds.set(launcherIconBounds); Loading Loading @@ -1212,8 +1207,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION : APP_LAUNCH_ALPHA_DOWN_DURATION; if (hasSplashScreen) { iconAlphaStart = 0; iconAlphaStart = hasSplashScreen ? 0 : 1f; // TOOD: Share value from shell when available. final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics()); Loading @@ -1223,14 +1217,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener cropWidthStart = (int) windowIconSize; cropHeightStart = (int) windowIconSize; } else { iconAlphaStart = 1; cropWidthStart = cropHeightStart = Math.min(windowTargetBounds.width(), windowTargetBounds.height()); cropCenterXStart = cropCenterYStart = Math.min(windowTargetBounds.centerX(), windowTargetBounds.centerY()); } cropWidthEnd = windowTargetBounds.width(); cropHeightEnd = windowTargetBounds.height(); Loading Loading
quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +9 −23 Original line number Diff line number Diff line Loading @@ -564,7 +564,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener // Set the crop here so we can calculate the corner radius below. crop.set(left, top, right, bottom); RectF targetBounds = new RectF(windowTargetBounds); RectF floatingIconBounds = new RectF(); RectF tmpRectF = new RectF(); Point tmpPos = new Point(); Loading Loading @@ -653,12 +652,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener tmpRectF.offset(dragLayerBounds[0], dragLayerBounds[1]); tmpRectF.offset(mDx.value, mDy.value); Utilities.scaleRectFAboutCenter(tmpRectF, mIconScaleToFitScreen.value); float windowTransX0 = tmpRectF.left - offsetX; float windowTransY0 = tmpRectF.top - offsetY; if (hasSplashScreen) { windowTransX0 -= crop.left * scale; windowTransY0 -= crop.top * scale; } float windowTransX0 = tmpRectF.left - offsetX - crop.left * scale; float windowTransY0 = tmpRectF.top - offsetY - crop.top * scale; // Calculate the icon position. floatingIconBounds.set(launcherIconBounds); Loading Loading @@ -1212,8 +1207,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION : APP_LAUNCH_ALPHA_DOWN_DURATION; if (hasSplashScreen) { iconAlphaStart = 0; iconAlphaStart = hasSplashScreen ? 0 : 1f; // TOOD: Share value from shell when available. final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics()); Loading @@ -1223,14 +1217,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener cropWidthStart = (int) windowIconSize; cropHeightStart = (int) windowIconSize; } else { iconAlphaStart = 1; cropWidthStart = cropHeightStart = Math.min(windowTargetBounds.width(), windowTargetBounds.height()); cropCenterXStart = cropCenterYStart = Math.min(windowTargetBounds.centerX(), windowTargetBounds.centerY()); } cropWidthEnd = windowTargetBounds.width(); cropHeightEnd = windowTargetBounds.height(); Loading