summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Yoshida <gyoshida@google.com>2019-09-13 15:42:26 -0700
committerGrant Yoshida <gyoshida@google.com>2019-09-13 22:58:00 +0000
commit0e3fa80fe7b483787ab3a41ca69f322860bd8bbe (patch)
tree58174fe71c6fae4fa9633784ddfa9bd7d252235e
parent7507e75b2b7c94dbea95430ab9b7eaa1afb4fbcf (diff)
downloaddevice_google_vrservices-0e3fa80fe7b483787ab3a41ca69f322860bd8bbe.tar.gz
device_google_vrservices-0e3fa80fe7b483787ab3a41ca69f322860bd8bbe.tar.bz2
device_google_vrservices-0e3fa80fe7b483787ab3a41ca69f322860bd8bbe.zip
Turn the lock screen off by default.
Bug: 141005456 Test: Wiped userdata on a OnePlus and verified lockscreen is disabled. Change-Id: If5ead126bd01a680dce16a3537a1cad996c47cff
-rw-r--r--xr/overlay/frameworks/base/core/res/res/values/config.xml7
-rw-r--r--xr/products/experimental_google_xr.mk2
2 files changed, 9 insertions, 0 deletions
diff --git a/xr/overlay/frameworks/base/core/res/res/values/config.xml b/xr/overlay/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..cd86be0
--- /dev/null
+++ b/xr/overlay/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,7 @@
+<!-- Customized settings for XR products -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Is the lock-screen disabled for new users by default -->
+ <bool name="config_disableLockscreenByDefault">true</bool>
+
+</resources>
diff --git a/xr/products/experimental_google_xr.mk b/xr/products/experimental_google_xr.mk
index 9070be1..999b719 100644
--- a/xr/products/experimental_google_xr.mk
+++ b/xr/products/experimental_google_xr.mk
@@ -32,6 +32,8 @@ PRODUCT_PROPERTY_OVERRIDES += ro.vendor.camera.external.hal3TrebleMinorVersion=5
PRODUCT_PACKAGES += NonXrProductPackagesRemover
+PRODUCT_PACKAGE_OVERLAYS := device/google/vrservices/xr/overlay
+
PRODUCT_COPY_FILES += \
device/google/vrservices/xr/init/init.xr.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/init.xr.rc \
device/google/vrservices/xr/scripts/boot-to-vr.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/boot-to-vr.sh \