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

Commit 850b0dab authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Correctly calculate top corner radius" into sc-dev am: 327a2716 am:... 

Merge "Correctly calculate top corner radius" into sc-dev am: 327a2716 am: b1bd636c am: 1ea01411

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

Change-Id: Iaca94a894fb5219389cb7f46f4046523db0df016
parents 66405ed0 1ea01411

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+2 −2
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.policy.ScreenDecorationsUtils;

import com.android.internal.util.LatencyTracker;

import com.android.keyguard.KeyguardStatusView;

import com.android.keyguard.KeyguardStatusViewController;
@@ -906,8 +907,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                R.dimen.pulse_expansion_max_top_overshoot);

        mScrimCornerRadius = mResources.getDimensionPixelSize(

                R.dimen.notification_scrim_corner_radius);

        mScreenCornerRadius = mResources.getDimensionPixelSize(

                com.android.internal.R.dimen.rounded_corner_radius);

        mScreenCornerRadius = (int) ScreenDecorationsUtils.getWindowCornerRadius(mResources);

        mNotificationScrimPadding = mResources.getDimensionPixelSize(

                R.dimen.notification_side_paddings);

        mLockscreenNotificationQSPadding = mResources.getDimensionPixelSize(