diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-07-23 15:22:30 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-25 04:12:12 +0000 |
| commit | 55ab9851a4af963d45344dc936eea62f540169c0 (patch) | |
| tree | c0da37f5f20978bf392cafa0ddf1f9322d87c9c5 /quickstep | |
| parent | 497f4379084d19c2cbf7c02aef662675d0a51975 (diff) | |
| download | android_packages_apps_Trebuchet-55ab9851a4af963d45344dc936eea62f540169c0.tar.gz android_packages_apps_Trebuchet-55ab9851a4af963d45344dc936eea62f540169c0.tar.bz2 android_packages_apps_Trebuchet-55ab9851a4af963d45344dc936eea62f540169c0.zip | |
Fix bug where rounded corners were being set despite being disabled.
Bug: 138117089
Change-Id: Icb852e2e07d80c45ad3406ef432b89720887fccf
(cherry picked from commit e734efba8dc58ea145dc0a620f18cbe2032f70ce)
Diffstat (limited to 'quickstep')
| -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 44324cb2e..b60a017dd 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 |