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

Merge "Fixing notification scrim bounds in split shade" into sc-dev am: 0be45a9f5b am: 5bd8f66916

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353372

Change-Id: Iea7177933a740beb270729b7618eab1e978e64a8
This commit is contained in:
Michał Brzeziński
2021-05-04 15:03:52 +00:00
committed by Automerger Merge Worker
parent 20b2c3bb60 5bd8f66916
commit 4c02dc18eb
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2073,7 +2073,6 @@ public class NotificationPanelViewController extends PanelViewController {
setQsExpansionEnabled(mAmbientState.getScrollY() == 0); setQsExpansionEnabled(mAmbientState.getScrollY() == 0);
int radius = mScrimCornerRadius; int radius = mScrimCornerRadius;
if (visible || !mShouldUseSplitNotificationShade) {
if (!mShouldUseSplitNotificationShade) { if (!mShouldUseSplitNotificationShade) {
top = (int) Math.min(qsPanelBottomY, notificationTop); top = (int) Math.min(qsPanelBottomY, notificationTop);
bottom = getView().getBottom(); bottom = getView().getBottom();
@@ -2081,13 +2080,12 @@ public class NotificationPanelViewController extends PanelViewController {
right = getView().getRight(); right = getView().getRight();
radius = (int) MathUtils.lerp(mScreenCornerRadius, mScrimCornerRadius, radius = (int) MathUtils.lerp(mScreenCornerRadius, mScrimCornerRadius,
Math.min(top / (float) mScrimCornerRadius, 1f)); Math.min(top / (float) mScrimCornerRadius, 1f));
} else { } else if (qsPanelBottomY > 0) { // so bounds are empty on lockscreen
top = Math.min(qsPanelBottomY, mSplitShadeNotificationsTopPadding); top = Math.min(qsPanelBottomY, mSplitShadeNotificationsTopPadding);
bottom = mNotificationStackScrollLayoutController.getHeight(); bottom = mNotificationStackScrollLayoutController.getHeight();
left = mNotificationStackScrollLayoutController.getLeft(); left = mNotificationStackScrollLayoutController.getLeft();
right = mNotificationStackScrollLayoutController.getRight(); right = mNotificationStackScrollLayoutController.getRight();
} }
}
// Fancy clipping for quick settings // Fancy clipping for quick settings
if (mQs != null) { if (mQs != null) {