Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing scrims jumping when media player state changes" into tm-qpr-dev

Browse Source
This commit is contained in:
Michał Brzeziński
2022-11-10 18:22:55 +00:00
committed by Android (Google) Code Review
parent e9bad1ca98 eb21e52b88
commit 193046441b
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -575,7 +575,7 @@ public final class NotificationPanelViewController implements Dumpable {
/** Whether the current animator is resetting the pulse expansion after a drag down. */ /** Whether the current animator is resetting the pulse expansion after a drag down. */
private boolean mIsPulseExpansionResetAnimator; private boolean mIsPulseExpansionResetAnimator;
private final Rect mKeyguardStatusAreaClipBounds = new Rect(); private final Rect mLastQsClipBounds = new Rect();
private final Region mQsInterceptRegion = new Region(); private final Region mQsInterceptRegion = new Region();
/** Alpha of the views which only show on the keyguard but not in shade / shade locked. */ /** Alpha of the views which only show on the keyguard but not in shade / shade locked. */
private float mKeyguardOnlyContentAlpha = 1.0f; private float mKeyguardOnlyContentAlpha = 1.0f;
@@ -2814,7 +2814,7 @@ public final class NotificationPanelViewController implements Dumpable {
*/ */
private void applyQSClippingBounds(int left, int top, int right, int bottom, private void applyQSClippingBounds(int left, int top, int right, int bottom,
boolean qsVisible) { boolean qsVisible) {
if (!mAnimateNextNotificationBounds || mKeyguardStatusAreaClipBounds.isEmpty()) { if (!mAnimateNextNotificationBounds || mLastQsClipBounds.isEmpty()) {
if (mQsClippingAnimation != null) { if (mQsClippingAnimation != null) {
// update the end position of the animator // update the end position of the animator
mQsClippingAnimationEndBounds.set(left, top, right, bottom); mQsClippingAnimationEndBounds.set(left, top, right, bottom);
@@ -2823,10 +2823,10 @@ public final class NotificationPanelViewController implements Dumpable {
} }
} else { } else {
mQsClippingAnimationEndBounds.set(left, top, right, bottom); mQsClippingAnimationEndBounds.set(left, top, right, bottom);
final int startLeft = mKeyguardStatusAreaClipBounds.left; final int startLeft = mLastQsClipBounds.left;
final int startTop = mKeyguardStatusAreaClipBounds.top; final int startTop = mLastQsClipBounds.top;
final int startRight = mKeyguardStatusAreaClipBounds.right; final int startRight = mLastQsClipBounds.right;
final int startBottom = mKeyguardStatusAreaClipBounds.bottom; final int startBottom = mLastQsClipBounds.bottom;
if (mQsClippingAnimation != null) { if (mQsClippingAnimation != null) {
mQsClippingAnimation.cancel(); mQsClippingAnimation.cancel();
} }
@@ -2863,12 +2863,10 @@ public final class NotificationPanelViewController implements Dumpable {
private void applyQSClippingImmediately(int left, int top, int right, int bottom, private void applyQSClippingImmediately(int left, int top, int right, int bottom,
boolean qsVisible) { boolean qsVisible) {
// Fancy clipping for quick settings
int radius = mScrimCornerRadius; int radius = mScrimCornerRadius;
boolean clipStatusView = false; boolean clipStatusView = false;
mLastQsClipBounds.set(left, top, right, bottom);
if (mIsFullWidth) { if (mIsFullWidth) {
// The padding on this area is large enough that we can use a cheaper clipping strategy
mKeyguardStatusAreaClipBounds.set(left, top, right, bottom);
clipStatusView = qsVisible; clipStatusView = qsVisible;
float screenCornerRadius = mRecordingController.isRecording() ? 0 : mScreenCornerRadius; float screenCornerRadius = mRecordingController.isRecording() ? 0 : mScreenCornerRadius;
radius = (int) MathUtils.lerp(screenCornerRadius, mScrimCornerRadius, radius = (int) MathUtils.lerp(screenCornerRadius, mScrimCornerRadius,
@@ -2903,8 +2901,8 @@ public final class NotificationPanelViewController implements Dumpable {
radius, radius,
qsVisible && !mSplitShadeEnabled); qsVisible && !mSplitShadeEnabled);
} }
mKeyguardStatusViewController.setClipBounds( // The padding on this area is large enough that we can use a cheaper clipping strategy
clipStatusView ? mKeyguardStatusAreaClipBounds : null); mKeyguardStatusViewController.setClipBounds(clipStatusView ? mLastQsClipBounds : null);
if (!qsVisible && mSplitShadeEnabled) { if (!qsVisible && mSplitShadeEnabled) {
// On the lockscreen when qs isn't visible, we don't want the bounds of the shade to // On the lockscreen when qs isn't visible, we don't want the bounds of the shade to
// be visible, otherwise you can see the bounds once swiping up to see bouncer // be visible, otherwise you can see the bounds once swiping up to see bouncer