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

This commit is contained in:
Shawn Lee
2023-06-30 00:26:01 +00:00
committed by Android (Google) Code Review

View File

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