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

Merge "Update notifications clipping for portrait large screens" into tm-qpr-dev

Browse Source
This commit is contained in:
Nick Chameyev
2022-06-01 12:18:46 +00:00
committed by Android (Google) Code Review
parent edc6a5606e 14ecfbf4e3
commit 2e143a6a4e
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -646,6 +646,7 @@ public class NotificationPanelViewController extends PanelViewController {
private int mScrimCornerRadius; private int mScrimCornerRadius;
private int mScreenCornerRadius; private int mScreenCornerRadius;
private boolean mQSAnimatingHiddenFromCollapsed; private boolean mQSAnimatingHiddenFromCollapsed;
private boolean mUseLargeScreenShadeHeader;
private int mQsClipTop; private int mQsClipTop;
private int mQsClipBottom; private int mQsClipBottom;
@@ -1137,18 +1138,20 @@ public class NotificationPanelViewController extends PanelViewController {
final boolean splitShadeChanged = mSplitShadeEnabled != newSplitShadeEnabled; final boolean splitShadeChanged = mSplitShadeEnabled != newSplitShadeEnabled;
mSplitShadeEnabled = newSplitShadeEnabled; mSplitShadeEnabled = newSplitShadeEnabled;
boolean useLargeScreenShadeHeader =
LargeScreenUtils.shouldUseLargeScreenShadeHeader(mView.getResources());
if (mQs != null) { if (mQs != null) {
mQs.setInSplitShade(mSplitShadeEnabled); mQs.setInSplitShade(mSplitShadeEnabled);
} }
mUseLargeScreenShadeHeader =
LargeScreenUtils.shouldUseLargeScreenShadeHeader(mView.getResources());
mLargeScreenShadeHeaderHeight = mLargeScreenShadeHeaderHeight =
mResources.getDimensionPixelSize(R.dimen.large_screen_shade_header_height); mResources.getDimensionPixelSize(R.dimen.large_screen_shade_header_height);
mQuickQsHeaderHeight = useLargeScreenShadeHeader ? mLargeScreenShadeHeaderHeight : mQuickQsHeaderHeight = mUseLargeScreenShadeHeader ? mLargeScreenShadeHeaderHeight :
SystemBarUtils.getQuickQsOffsetHeight(mView.getContext()); SystemBarUtils.getQuickQsOffsetHeight(mView.getContext());
int topMargin = useLargeScreenShadeHeader ? mLargeScreenShadeHeaderHeight : int topMargin = mUseLargeScreenShadeHeader ? mLargeScreenShadeHeaderHeight :
mResources.getDimensionPixelSize(R.dimen.notification_panel_margin_top); mResources.getDimensionPixelSize(R.dimen.notification_panel_margin_top);
mLargeScreenShadeHeaderController.setActive(useLargeScreenShadeHeader); mLargeScreenShadeHeaderController.setActive(mUseLargeScreenShadeHeader);
mAmbientState.setStackTopMargin(topMargin); mAmbientState.setStackTopMargin(topMargin);
mNotificationsQSContainerController.updateResources(); mNotificationsQSContainerController.updateResources();
@@ -2436,8 +2439,8 @@ public class NotificationPanelViewController extends PanelViewController {
} }
/** /**
* Updates scrim bounds, QS clipping, and KSV clipping as well based on the bounds of the shade * Updates scrim bounds, QS clipping, notifications clipping and keyguard status view clipping
* and QS state. * as well based on the bounds of the shade and QS state.
*/ */
private void setQSClippingBounds() { private void setQSClippingBounds() {
final int qsPanelBottomY = calculateQsBottomPosition(computeQsExpansionFraction()); final int qsPanelBottomY = calculateQsBottomPosition(computeQsExpansionFraction());
@@ -2513,6 +2516,13 @@ public class NotificationPanelViewController extends PanelViewController {
} }
} }
/**
* Applies clipping to quick settings, notifications layout and
* updates bounds of the notifications background (notifications scrim).
*
* The parameters are bounds of the notifications area rectangle, this function
* calculates bounds for the QS clipping based on the notifications bounds.
*/
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 || mKeyguardStatusAreaClipBounds.isEmpty()) {
@@ -2648,12 +2658,10 @@ public class NotificationPanelViewController extends PanelViewController {
if (mTransitioningToFullShadeProgress > 0.0f) { if (mTransitioningToFullShadeProgress > 0.0f) {
return mTransitionToFullShadeQSPosition; return mTransitionToFullShadeQSPosition;
} else { } else {
int qsBottomY = (int) getHeaderTranslation() + mQs.getQsMinExpansionHeight(); int qsBottomYFrom = (int) getHeaderTranslation() + mQs.getQsMinExpansionHeight();
if (qsExpansionFraction != 0.0) { int expandedTopMargin = mUseLargeScreenShadeHeader ? mLargeScreenShadeHeaderHeight : 0;
qsBottomY = (int) MathUtils.lerp( int qsBottomYTo = mQs.getDesiredHeight() + expandedTopMargin;
qsBottomY, mQs.getDesiredHeight(), qsExpansionFraction); return (int) MathUtils.lerp(qsBottomYFrom, qsBottomYTo, qsExpansionFraction);
}
return qsBottomY;
} }
} }
@@ -5012,7 +5020,8 @@ public class NotificationPanelViewController extends PanelViewController {
mDebugPaint.setColor(color); mDebugPaint.setColor(color);
canvas.drawLine(/* startX= */ 0, /* startY= */ y, /* stopX= */ mView.getWidth(), canvas.drawLine(/* startX= */ 0, /* startY= */ y, /* stopX= */ mView.getWidth(),
/* stopY= */ y, mDebugPaint); /* stopY= */ y, mDebugPaint);
canvas.drawText(label, /* x= */ 0, /* y= */ computeDebugYTextPosition(y), mDebugPaint); canvas.drawText(label + " = " + y + "px", /* x= */ 0,
/* y= */ computeDebugYTextPosition(y), mDebugPaint);
} }
private int computeDebugYTextPosition(int lineY) { private int computeDebugYTextPosition(int lineY) {