From 12f3d9e2be76a9a6e1bdae79f7907553ec4c8a3e Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Fri, 9 Mar 2018 17:30:14 +0100
Subject: [PATCH] Multi cutout: replace narrow with corner overlay

Bug: 74982138
Test: make droid
Change-Id: Ia6b25a0cf3718d316f944b7abf44fe9711fa0cf5
---
 CleanSpec.mk                           | 3 ++-
 target/product/generic_no_telephony.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index d2b9caf8b2..fd12a784f7 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -463,8 +463,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/manifest.xml)
 $(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
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 90e55b78c3..6a84c35f55 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -30,7 +30,7 @@ PRODUCT_PACKAGES := \
     SystemUI \
     SysuiDarkThemeOverlay \
     DisplayCutoutEmulationDoubleOverlay \
-    DisplayCutoutEmulationNarrowOverlay \
+    DisplayCutoutEmulationCornerOverlay \
     DisplayCutoutEmulationTallOverlay \
     EasterEgg \
     WallpaperCropper