diff options
| author | Lucas Dupin <dupin@google.com> | 2019-11-21 15:15:36 -0800 |
|---|---|---|
| committer | Lucas Dupin <dupin@google.com> | 2019-11-24 17:29:23 -0800 |
| commit | 6e9636c5e0bde377e43fafaef80d13e8cb57fb92 (patch) | |
| tree | 3180a605eb8b2055d1ab7fbcc0992ff76f6df74c /core/java/android/view/DisplayCutout.java | |
| parent | 339650b13240893f6f6df143033dd1d427df10b4 (diff) | |
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
Diffstat (limited to 'core/java/android/view/DisplayCutout.java')
| -rw-r--r-- | core/java/android/view/DisplayCutout.java | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |