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

Commit 31cbcd53 authored by Shawn Lee's avatar Shawn Lee Committed by Android (Google) Code Review
Browse files

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

parents 5a334529 6702eaa0

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

+5 −4
Original line number Diff line number Diff line
@@ -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()) {