Merge "Correctly calculate top corner radius" into sc-dev
This commit is contained in:
@@ -75,6 +75,7 @@ import com.android.internal.annotations.VisibleForTesting;
|
|||||||
import com.android.internal.jank.InteractionJankMonitor;
|
import com.android.internal.jank.InteractionJankMonitor;
|
||||||
import com.android.internal.logging.MetricsLogger;
|
import com.android.internal.logging.MetricsLogger;
|
||||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||||
|
import com.android.internal.policy.ScreenDecorationsUtils;
|
||||||
import com.android.internal.util.LatencyTracker;
|
import com.android.internal.util.LatencyTracker;
|
||||||
import com.android.keyguard.KeyguardStatusView;
|
import com.android.keyguard.KeyguardStatusView;
|
||||||
import com.android.keyguard.KeyguardStatusViewController;
|
import com.android.keyguard.KeyguardStatusViewController;
|
||||||
@@ -906,8 +907,7 @@ public class NotificationPanelViewController extends PanelViewController {
|
|||||||
R.dimen.pulse_expansion_max_top_overshoot);
|
R.dimen.pulse_expansion_max_top_overshoot);
|
||||||
mScrimCornerRadius = mResources.getDimensionPixelSize(
|
mScrimCornerRadius = mResources.getDimensionPixelSize(
|
||||||
R.dimen.notification_scrim_corner_radius);
|
R.dimen.notification_scrim_corner_radius);
|
||||||
mScreenCornerRadius = mResources.getDimensionPixelSize(
|
mScreenCornerRadius = (int) ScreenDecorationsUtils.getWindowCornerRadius(mResources);
|
||||||
com.android.internal.R.dimen.rounded_corner_radius);
|
|
||||||
mNotificationScrimPadding = mResources.getDimensionPixelSize(
|
mNotificationScrimPadding = mResources.getDimensionPixelSize(
|
||||||
R.dimen.notification_side_paddings);
|
R.dimen.notification_side_paddings);
|
||||||
mLockscreenNotificationQSPadding = mResources.getDimensionPixelSize(
|
mLockscreenNotificationQSPadding = mResources.getDimensionPixelSize(
|
||||||
|
|||||||
Reference in New Issue
Block a user