summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-20 22:06:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-20 22:06:01 +0000
commit3bb284492d75dbc375f9e6da02076d7cbbdfc4de (patch)
tree4306e9a972212333850aa4ae0f09c81994e8f517 /core/java/android
parent98b2f2580142f226c56f0f3ca40f302b05eec546 (diff)
parent21cc2e5f7dda348750a818a04edae11fc4d31a5a (diff)
Support @left marker am: 21cc2e5f7d
Change-Id: I55bc7ee5b21dd5cf34da5944c7fad8169a34ca6d
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/DisplayCutout.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/DisplayCutout.java b/core/java/android/view/DisplayCutout.java
index 715181f28076..e77d7191d5b8 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
@@ -642,6 +643,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;
}