vendor: Refactor setup wizard overlays
Change-Id: I3d5cf6a57d9b16c7e44a47374aa474c390658a50
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index b4fe5e5..5b4131b 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -80,7 +80,8 @@
# PixelSetupWizard overlay
PRODUCT_PACKAGES += \
- PixelSetupWizardOverlay
+ PixelSetupWizardOverlay \
+ PixelSetupWizardAodOverlay
# Snap Camera
PRODUCT_PACKAGES += \
diff --git a/packages/overlays/PixelSetupWizardAodOverlay/Android.mk b/packages/overlays/PixelSetupWizardAodOverlay/Android.mk
new file mode 100644
index 0000000..97eda8c
--- /dev/null
+++ b/packages/overlays/PixelSetupWizardAodOverlay/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := PixelSetupWizardAodOverlay
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PACKAGE)
diff --git a/packages/overlays/PixelSetupWizardAodOverlay/AndroidManifest.xml b/packages/overlays/PixelSetupWizardAodOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..b976d8f
--- /dev/null
+++ b/packages/overlays/PixelSetupWizardAodOverlay/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.google.android.pixel.setupwizard.overlay.aod"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <overlay android:targetPackage="com.google.android.pixel.setupwizard" android:priority="1" />
+
+ <application android:label="Setup wizard" android:hasCode="false"/>
+</manifest>
diff --git a/packages/overlays/PixelSetupWizardAodOverlay/res/values/bools.xml b/packages/overlays/PixelSetupWizardAodOverlay/res/values/bools.xml
new file mode 100644
index 0000000..1586e0f
--- /dev/null
+++ b/packages/overlays/PixelSetupWizardAodOverlay/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <bool name="show_always_on_display_opt_in">false</bool>
+</resources>
diff --git a/packages/overlays/PixelSetupWizardOverlay/res/values/bools.xml b/packages/overlays/PixelSetupWizardOverlay/res/values/bools.xml
index 1586e0f..1a64a7e 100644
--- a/packages/overlays/PixelSetupWizardOverlay/res/values/bools.xml
+++ b/packages/overlays/PixelSetupWizardOverlay/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_always_on_display_opt_in">false</bool>
+ <bool name="show_air_gestures_opt_in">false</bool>
</resources>