aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 01:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Have one app open animation properties for both cold/start app launch." into sc-dev

Browse Source
This commit is contained in:
Jonathan Miranda
2021-04-23 22:43:35 +00:00
committed by Android (Google) Code Review
parent d15a58d528 d801f5d214
commit 5018eff3a2
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
View File

@@ -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();
@@ -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);
@@ -1212,25 +1207,16 @@ 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());
// TOOD: Share value from shell when available.
final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics());
cropCenterXStart = windowTargetBounds.centerX();
cropCenterYStart = windowTargetBounds.centerY();
cropCenterXStart = windowTargetBounds.centerX();
cropCenterYStart = windowTargetBounds.centerY();
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());
}
cropWidthStart = (int) windowIconSize;
cropHeightStart = (int) windowIconSize;
cropWidthEnd = windowTargetBounds.width();
cropHeightEnd = windowTargetBounds.height();