vendor: Cleanup SetupWizard overlays

Change-Id: Ie1238ba574017ade7b279cf77f26e517a104014b
PixelOS-and-Not-So-Pixel · Nov 23, 2020 · 5e3bc51 · 5e3bc51
1 parent c14c217
commit 5e3bc51
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 36 deletions.
diff --git a/config/common.mk b/config/common.mk
@@ -119,7 +119,6 @@ PRODUCT_PACKAGES += \
 
 # PixelSetupWizard overlay
 PRODUCT_PACKAGES += \
-    PixelSetupWizardOverlay \
     PixelSetupWizardAodOverlay
 
 # Dex preopt

diff --git a/packages/overlays/PixelSetupWizardAodOverlay/Android.mk b/packages/overlays/PixelSetupWizardAodOverlay/Android.mk
diff --git a/packages/overlays/PixelSetupWizardAodOverlay/res/values/bools.xml b/packages/overlays/PixelSetupWizardAodOverlay/res/values/bools.xml
diff --git a/packages/overlays/PixelSetupWizardOverlay/Android.mk b/packages/overlays/PixelSetupWizardOverlay/Android.mk
diff --git a/packages/overlays/PixelSetupWizardOverlay/AndroidManifest.xml b/packages/overlays/PixelSetupWizardOverlay/AndroidManifest.xml
diff --git a/rro_overlays/PixelSetupWizardAodOverlay/Android.bp b/rro_overlays/PixelSetupWizardAodOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "PixelSetupWizardAodOverlay",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/...SetupWizardAodOverlay/AndroidManifest.xml → ...SetupWizardAodOverlay/AndroidManifest.xml b/...SetupWizardAodOverlay/AndroidManifest.xml → ...SetupWizardAodOverlay/AndroidManifest.xml
diff --git a/...elSetupWizardOverlay/res/values/bools.xml → ...etupWizardAodOverlay/res/values/bools.xml b/...elSetupWizardOverlay/res/values/bools.xml → ...etupWizardAodOverlay/res/values/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <bool name="show_air_gestures_opt_in">false</bool>
+    <bool name="show_always_on_display_opt_in">true</bool>
 </resources>