diff options
| author | Shawn Lin <shawnlin@google.com> | 2021-09-03 03:57:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-09-03 03:57:09 +0000 |
| commit | fe2aed97c5f8f4e1e2d51fbbfeadb1f492b80d83 (patch) | |
| tree | bbb2972e9e56d318383c49c9d66854759dc54caf /quickstep/src/com/android/launcher3/QuickstepTransitionManager.java | |
| parent | b9e08f5773714ce3f6d87a85509bf6c44b3a24de (diff) | |
| parent | 4e15fe0726d62d6e0e63be3afbba5c57b36ce6a3 (diff) | |
Merge "[DO NOT MERGE] Update QuickStepContract.getWindowCornerRadius API" into sc-v2-dev
Diffstat (limited to 'quickstep/src/com/android/launcher3/QuickstepTransitionManager.java')
| -rw-r--r-- | quickstep/src/com/android/launcher3/QuickstepTransitionManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 494b953e53..89cc1f614c 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -676,7 +676,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener ? Math.max(crop.width(), crop.height()) / 2f : 0f; final float finalWindowRadius = mDeviceProfile.isMultiWindowMode - ? 0 : getWindowCornerRadius(mLauncher.getResources()); + ? 0 : getWindowCornerRadius(mLauncher); final float finalShadowRadius = appTargetsAreTranslucent ? 0 : mMaxShadowRadius; MultiValueUpdateListener listener = new MultiValueUpdateListener() { @@ -867,7 +867,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener } final float finalWindowRadius = mDeviceProfile.isMultiWindowMode - ? 0 : getWindowCornerRadius(mLauncher.getResources()); + ? 0 : getWindowCornerRadius(mLauncher); final FloatingWidgetView floatingView = FloatingWidgetView.getFloatingWidgetView(mLauncher, v, widgetBackgroundBounds, new Size(windowTargetBounds.width(), windowTargetBounds.height()), @@ -1149,7 +1149,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener ValueAnimator unlockAnimator = ValueAnimator.ofFloat(0, 1); unlockAnimator.setDuration(CLOSING_TRANSITION_DURATION_MS); float cornerRadius = mDeviceProfile.isMultiWindowMode ? 0 : - QuickStepContract.getWindowCornerRadius(mLauncher.getResources()); + QuickStepContract.getWindowCornerRadius(mLauncher); unlockAnimator.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { @@ -1191,7 +1191,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener ValueAnimator closingAnimator = ValueAnimator.ofFloat(0, 1); int duration = CLOSING_TRANSITION_DURATION_MS; float windowCornerRadius = mDeviceProfile.isMultiWindowMode - ? 0 : getWindowCornerRadius(mLauncher.getResources()); + ? 0 : getWindowCornerRadius(mLauncher); float startShadowRadius = areAllTargetsTranslucent(appTargets) ? 0 : mMaxShadowRadius; closingAnimator.setDuration(duration); closingAnimator.addUpdateListener(new MultiValueUpdateListener() { |