From 550f658fa25433630bdbe092a607c30756426ff1 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Thu, 8 Mar 2018 20:08:19 +0100 Subject: [PATCH] Cutout: Add a multi cutout overlay Bug: 74195186 Test: Developer Settings > Simulate a display with a cutout > Double display cutout Change-Id: Iff621bd047c3c55d6e4f0e20eaa560706bfc4059 --- .../Android.mk | 14 ++++ .../AndroidManifest.xml | 26 +++++++ .../res/values/config.xml | 67 +++++++++++++++++++ .../res/values/strings.xml | 22 ++++++ 4 files changed, 129 insertions(+) create mode 100644 packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk create mode 100644 packages/overlays/DisplayCutoutEmulationDoubleOverlay/AndroidManifest.xml create mode 100644 packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml create mode 100644 packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/strings.xml diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk new file mode 100644 index 0000000000000..d83b30a8785a7 --- /dev/null +++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk @@ -0,0 +1,14 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := DisplayCutoutEmulationDouble +LOCAL_CERTIFICATE := platform + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := DisplayCutoutEmulationDoubleOverlay +LOCAL_SDK_VERSION := current + +include $(BUILD_RRO_PACKAGE) diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/AndroidManifest.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/AndroidManifest.xml new file mode 100644 index 0000000000000..5d3385d17961d --- /dev/null +++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml new file mode 100644 index 0000000000000..ca261f98cfae8 --- /dev/null +++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml @@ -0,0 +1,67 @@ + + + + + + + M 0,0 + L -72, 0 + L -69.9940446283, 20.0595537175 + C -69.1582133885, 28.4178661152 -65.2, 32.0 -56.8, 32.0 + L 56.8, 32.0 + C 65.2, 32.0 69.1582133885, 28.4178661152 69.9940446283, 20.0595537175 + L 72, 0 + Z + @bottom + M 0,0 + L -72, 0 + L -69.9940446283, -20.0595537175 + C -69.1582133885, -28.4178661152 -65.2, -32.0 -56.8, -32.0 + L 56.8, -32.0 + C 65.2, -32.0 69.1582133885, -28.4178661152 69.9940446283, -20.0595537175 + L 72, 0 + Z + @dp + + + + true + + + 48dp + 28dp + + 48dp + + 176dp + + + + diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/strings.xml new file mode 100644 index 0000000000000..68c2dcbbe3f6b --- /dev/null +++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/strings.xml @@ -0,0 +1,22 @@ + + + + + Double display cutout + + +