diff options
author | Tony Wickham <twickham@google.com> | 2019-05-02 12:31:02 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2019-05-02 12:31:02 -0700 |
commit | 54acd8a29a0a964f98b58490e0ed7c211adc40e5 (patch) | |
tree | b85fbe0936b2ad55a73b47a877399cbbed300686 /quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java | |
parent | 36abdcbc1073f9965b56d6d1a5500542af5338be (diff) | |
download | android_packages_apps_Trebuchet-54acd8a29a0a964f98b58490e0ed7c211adc40e5.tar.gz android_packages_apps_Trebuchet-54acd8a29a0a964f98b58490e0ed7c211adc40e5.tar.bz2 android_packages_apps_Trebuchet-54acd8a29a0a964f98b58490e0ed7c211adc40e5.zip |
Don't draw task insets or corners in multi window mode
Test (all in multi window and non-multi window):
- Quick switch from home screen
- Quick switch from an app
- Swipe up from an app (slowly)
- Swipe down on a task (slowly)
Bug: 131689686
Change-Id: I69bf6dd1a34904cdf5ec7febea8f858012e2a0ac
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java index cb2bf1f79..3109921fb 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java @@ -31,11 +31,12 @@ import android.graphics.RectF; import android.os.Build; import android.os.RemoteException; +import androidx.annotation.Nullable; + import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.util.Themes; import com.android.launcher3.views.BaseDragLayer; import com.android.quickstep.RecentsModel; import com.android.quickstep.views.RecentsView; @@ -50,8 +51,6 @@ import com.android.systemui.shared.system.WindowManagerWrapper; import java.util.function.BiFunction; -import androidx.annotation.Nullable; - /** * Utility class to handle window clip animation */ @@ -327,12 +326,14 @@ public class ClipAnimationHelper { float scale = mTargetRect.width() / mSourceRect.width(); float insetProgress = (1 - progress); + float windowCornerRadius = mUseRoundedCornersOnWindows + ? mWindowCornerRadius : 0; ttv.drawOnCanvas(canvas, -mSourceWindowClipInsets.left * insetProgress, -mSourceWindowClipInsets.top * insetProgress, ttv.getMeasuredWidth() + mSourceWindowClipInsets.right * insetProgress, ttv.getMeasuredHeight() + mSourceWindowClipInsets.bottom * insetProgress, - Utilities.mapRange(progress, mWindowCornerRadius * scale, ttv.getCornerRadius())); + Utilities.mapRange(progress, windowCornerRadius * scale, ttv.getCornerRadius())); } public RectF getTargetRect() { |