Merge "Fixed notification scrim top corner radius" into udc-qpr-dev am: 31cbcd539b

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

Change-Id: I9f7d5ca3205411f069ce7685395e5c8aae4f4c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lee
2023-06-30 00:36:43 +00:00
committed by Automerger Merge Worker

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()) {