From cf4ba7df8da4edbabfdc56bf26cad8855088db96 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 1 Jun 2021 18:33:18 -0700 Subject: [PATCH] Correctly calculate top corner radius We need to also take rounded_corner_radius_adjustment into account, as well as the custom top corner radius. Fixes: 188614159 Test: manual Change-Id: I5461a67981f64cbc828b6c3d77198a3dfc6c60a1 --- .../statusbar/phone/NotificationPanelViewController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 7737420cf0262..68a90dd4a325e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -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; @@ -897,8 +898,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(