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

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

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

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



Change-Id: I9f7d5ca3205411f069ce7685395e5c8aae4f4c0d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49618be5 31cbcd53

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