diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-08-01 15:31:05 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-01 15:31:05 -0700 |
| commit | 3ff3991f482ba4339f7521cda58040139e7c1aac (patch) | |
| tree | c9cb42b19202e93e0ea4851d43f975ae16a69b01 | |
| parent | 3a54ba929684ba362d8c55eec8e9706af512d0a0 (diff) | |
| parent | 783717c0c6b52e832044fe32764043424fdd1154 (diff) | |
| download | packages_apps_Trebuchet-3ff3991f482ba4339f7521cda58040139e7c1aac.tar.gz packages_apps_Trebuchet-3ff3991f482ba4339f7521cda58040139e7c1aac.tar.bz2 packages_apps_Trebuchet-3ff3991f482ba4339f7521cda58040139e7c1aac.zip | |
Merge "Fix bug where rounded corners were being set despite being disabled." into ub-launcher3-qt-dev am: 9da9a2bd21 am: f20a7d252c
am: 783717c0c6
Change-Id: I2c9738fa84d781cbfa9a6fbc071468a5247190ef
| -rw-r--r-- | quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java index fc8d02a71..991408c64 100644 --- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java @@ -32,6 +32,7 @@ import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS; import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION; import static com.android.quickstep.TaskUtils.taskIsATargetWithMode; import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius; +import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows; import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING; import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING; @@ -495,6 +496,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans endCrop = windowTargetBounds.height(); } + final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources()) + ? startCrop / 2f : 0f; final float windowRadius = mDeviceProfile.isMultiWindowMode ? 0 : getWindowCornerRadius(mLauncher.getResources()); appAnimator.addUpdateListener(new MultiValueUpdateListener() { @@ -506,7 +509,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans alphaDuration, LINEAR); FloatProp mCroppedSize = new FloatProp(startCrop, endCrop, 0, CROP_DURATION, EXAGGERATED_EASE); - FloatProp mWindowRadius = new FloatProp(startCrop / 2f, windowRadius, 0, + FloatProp mWindowRadius = new FloatProp(initialWindowRadius, windowRadius, 0, RADIUS_DURATION, EXAGGERATED_EASE); @Override |