From 178ca3d602cf7e2d17877551e68dbea6b61e9900 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 2 Jun 2020 23:44:59 +0200
Subject: [PATCH] Add Moto One Action overlay (vendor is perfect except for
 notch)

---
 Moto/OneAction/Android.mk                |  8 ++++++++
 Moto/OneAction/AndroidManifest.xml       | 14 +++++++++++++
 Moto/OneAction/res/values-land/notch.xml | 20 +++++++++++++++++++
 Moto/OneAction/res/values/notch.xml      | 25 ++++++++++++++++++++++++
 overlay.mk                               |  4 +++-
 5 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 Moto/OneAction/Android.mk
 create mode 100644 Moto/OneAction/AndroidManifest.xml
 create mode 100644 Moto/OneAction/res/values-land/notch.xml
 create mode 100644 Moto/OneAction/res/values/notch.xml

diff --git a/Moto/OneAction/Android.mk b/Moto/OneAction/Android.mk
new file mode 100644
index 0000000..a38b175
--- /dev/null
+++ b/Moto/OneAction/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-moto-one-action
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Moto/OneAction/AndroidManifest.xml b/Moto/OneAction/AndroidManifest.xml
new file mode 100644
index 0000000..8c196b9
--- /dev/null
+++ b/Moto/OneAction/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.moto.one.action"
+        android:versionCode="1"
+        android:versionName="1.0">
+	<!--
+		TESTS: Ignore ro.vendor.product.name
+		Same as G6 Plus
+	-->
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.vendor.product.device"
+                android:requiredSystemPropertyValue="troika_sprout"
+		android:priority="536"
+		android:isStatic="true" />
+</manifest>
diff --git a/Moto/OneAction/res/values-land/notch.xml b/Moto/OneAction/res/values-land/notch.xml
new file mode 100644
index 0000000..3d158b3
--- /dev/null
+++ b/Moto/OneAction/res/values-land/notch.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+</resources>
diff --git a/Moto/OneAction/res/values/notch.xml b/Moto/OneAction/res/values/notch.xml
new file mode 100644
index 0000000..ab4efbf
--- /dev/null
+++ b/Moto/OneAction/res/values/notch.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- Height of the status bar in portrait -->
+    <dimen name="status_bar_height_portrait">165px</dimen>
+    <!-- Height of the status bar in landscape -->
+    <dimen name="status_bar_height_landscape">24dp</dimen>
+    <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 L 0,165 L 165,165 L 165,0 Z @left</string>
+</resources>
diff --git a/overlay.mk b/overlay.mk
index 000ab68..829a37e 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -17,10 +17,11 @@ PRODUCT_PACKAGES += \
 	treble-overlay-caf-ims \
 	treble-overlay-devinputjack \
 	treble-overlay-duoqin-qin2pro \
-	treble-overlay-essential-ph_1 \
+	treble-overlay-essential-ph-1 \
 	treble-overlay-fairphone-fp3 \
 	treble-overlay-htc-exodus1 \
 	treble-overlay-gestures \
+	treble-overlay-htc-exodus1 \
 	treble-overlay-htc-u12plus \
 	treble-overlay-huawei \
 	treble-overlay-huawei-ANE \
@@ -61,6 +62,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-moto-g8plus \
 	treble-overlay-moto-g8power \
 	treble-overlay-moto-one \
+	treble-overlay-moto-one-action \
 	treble-overlay-moto-onehyper \
 	treble-overlay-mtk-ims \
 	treble-overlay-nokia-b2n-7plus \