From 6e9636c5e0bde377e43fafaef80d13e8cb57fb92 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 21 Nov 2019 15:15:36 -0800 Subject: Support @left marker By default cutouts are centered and support a @right marker to allow them to be right aligned. Let's also support left alignment by introducing a @left marker. Test: atest DisplayCutoutTest Test: manual Bug: 143222961 Change-Id: Ic5a645bd9f0513f3665f31c8b0f1861585bf30e6 --- core/java/android/view/DisplayCutout.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'core/java/android/view/DisplayCutout.java') diff --git a/core/java/android/view/DisplayCutout.java b/core/java/android/view/DisplayCutout.java index 797c128e514c..67855ae3e5b2 100644 --- a/core/java/android/view/DisplayCutout.java +++ b/core/java/android/view/DisplayCutout.java @@ -66,6 +66,7 @@ public final class DisplayCutout { private static final String BOTTOM_MARKER = "@bottom"; private static final String DP_MARKER = "@dp"; private static final String RIGHT_MARKER = "@right"; + private static final String LEFT_MARKER = "@left"; /** * Category for overlays that allow emulating a display cutout on devices that don't have @@ -647,6 +648,9 @@ public final class DisplayCutout { if (spec.endsWith(RIGHT_MARKER)) { offsetX = displayWidth; spec = spec.substring(0, spec.length() - RIGHT_MARKER.length()).trim(); + } else if (spec.endsWith(LEFT_MARKER)) { + offsetX = 0; + spec = spec.substring(0, spec.length() - LEFT_MARKER.length()).trim(); } else { offsetX = displayWidth / 2f; } -- cgit v1.2.3