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

Merge "Fixed notification scrim top corner radius" into udc-qpr-dev

Browse Source
This commit is contained in:
Shawn Lee
2023-06-30 00:26:01 +00:00
committed by Android (Google) Code Review
parent 5a334529d8 6702eaa08b
commit 31cbcd539b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
View File

@@ -1220,14 +1220,15 @@ public class QuickSettingsController implements Dumpable {
if (mIsFullWidth) { if (mIsFullWidth) {
clipStatusView = qsVisible; clipStatusView = qsVisible;
float screenCornerRadius = float screenCornerRadius =
!mSplitShadeEnabled || mRecordingController.isRecording() mRecordingController.isRecording() || mCastController.hasConnectedCastDevice()
|| mCastController.hasConnectedCastDevice()
? 0 : mScreenCornerRadius; ? 0 : mScreenCornerRadius;
radius = (int) MathUtils.lerp(screenCornerRadius, mScrimCornerRadius, radius = (int) MathUtils.lerp(screenCornerRadius, mScrimCornerRadius,
Math.min(top / (float) mScrimCornerRadius, 1f)); Math.min(top / (float) mScrimCornerRadius, 1f));
float bottomRadius = mExpanded ? screenCornerRadius : float bottomRadius = mSplitShadeEnabled ? screenCornerRadius : 0;
calculateBottomCornerRadius(screenCornerRadius); if (!mExpanded) {
bottomRadius = calculateBottomCornerRadius(bottomRadius);
}
mScrimController.setNotificationBottomRadius(bottomRadius); mScrimController.setNotificationBottomRadius(bottomRadius);
} }
if (isQsFragmentCreated()) { if (isQsFragmentCreated()) {