Merge "Fixing top notifications cut off on the lockscreen" into tm-dev am: 612b7a69dc

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

Change-Id: I765b516ed5d9803fa5aa2853265e01058d23baad
This commit is contained in:
Michał Brzeziński
2022-03-07 18:37:49 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 2 deletions

View File

@@ -24,4 +24,6 @@
<dimen name="keyguard_split_shade_top_margin">72dp</dimen> <dimen name="keyguard_split_shade_top_margin">72dp</dimen>
<dimen name="notification_panel_margin_horizontal">24dp</dimen> <dimen name="notification_panel_margin_horizontal">24dp</dimen>
<dimen name="split_shade_header_height">56dp</dimen>
</resources> </resources>

View File

@@ -199,10 +199,13 @@ public class Utils {
/** /**
* Gets the {@link R.dimen#split_shade_header_height}. * Gets the {@link R.dimen#split_shade_header_height}.
* *
* Currently, it's the same as {@link com.android.internal.R.dimen#quick_qs_offset_height}. * It should be fine to not ignore cutouts as split shade might not want to react to them:
* for split shade header, which is only on bigger screens, either cutout won't be a problem
* (it's usually centered and in split shade that's likely empty area) or we probably want to
* handle it differently.
*/ */
public static int getSplitShadeStatusBarHeight(Context context) { public static int getSplitShadeStatusBarHeight(Context context) {
return SystemBarUtils.getQuickQsOffsetHeight(context); return context.getResources().getDimensionPixelSize(R.dimen.split_shade_header_height);
} }
/** /**