commit dc3806d97ea9933c5ec6627635973116fef5cdca
author Adrian Roos <roosa@google.com> Fri Mar 16 14:27:30 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 16 14:27:30 2018 +0000
tree 046ae3e8c40d41c8845684277321ca120aab7476
parent 85f1698fa0cca533c0217fe9d8c72fe49b6507d9
parent 12f3d9e2be76a9a6e1bdae79f7907553ec4c8a3e

Merge "Multi cutout: replace narrow with corner overlay" into pi-dev

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index d2b9caf..fd12a78 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -463,8 +463,9 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/compatibility_matrix.xml)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/compatibility_matrix.xml)
 
-# Remove DisplayCutoutEmulationWide overlay
+# Remove DisplayCutoutEmulation overlays
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/DisplayCutoutEmulationWide)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/DisplayCutoutEmulationNarrow)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 90e55b7..6a84c35 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -30,7 +30,7 @@
     SystemUI \
     SysuiDarkThemeOverlay \
     DisplayCutoutEmulationDoubleOverlay \
-    DisplayCutoutEmulationNarrowOverlay \
+    DisplayCutoutEmulationCornerOverlay \
     DisplayCutoutEmulationTallOverlay \
     EasterEgg \
     WallpaperCropper