Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97617a7f authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Remove bottom corner radius from notification scrim" into udc-dev am:... 

Merge "Remove bottom corner radius from notification scrim" into udc-dev am: bb1baef8 am: 8cf29d71

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



Change-Id: I2fe130f5b6737e68196cff0016a1e796c709f725
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e8f1ee6 8cf29d71

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java

+2 −1
Original line number Diff line number Diff line
@@ -1206,7 +1206,8 @@ public class QuickSettingsController implements Dumpable { 
        if (mIsFullWidth) {

            clipStatusView = qsVisible;

            float screenCornerRadius =

                    mRecordingController.isRecording() || mCastController.hasConnectedCastDevice()

                    !mSplitShadeEnabled || mRecordingController.isRecording()

                            || mCastController.hasConnectedCastDevice()

                            ? 0 : mScreenCornerRadius;

            radius = (int) MathUtils.lerp(screenCornerRadius, mScrimCornerRadius,

                    Math.min(top / (float) mScrimCornerRadius, 1f));