summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Poultney <poultney@google.com> 2022-10-18 15:06:21 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-10-18 15:06:21 +0000
commitcb69035ca90db251f00eafa95b35003f811530bd (patch)
treec166ce91a4f2f79b12e03c79e688775432f8106f
parent0f8f2d726b480dfeb4c036e071a44ba2ce8349d4 (diff)
parentb24cf598fb96a42053d2303b6c0106176668e5f1 (diff)
Merge "Add a flag to enable independent lock screen live wallpaper" into tm-qpr-dev
-rw-r--r--core/res/res/values/config.xml4
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 077b6181743a..41256b86bf06 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -5958,4 +5958,8 @@
TODO(b/236022708) Move rear display state to device state config file
-->
<integer name="config_deviceStateRearDisplay">-1</integer>
+
+ <!-- Whether the lock screen is allowed to run its own live wallpaper,
+ different from the home screen wallpaper. -->
+ <bool name="config_independentLockscreenLiveWallpaper">false</bool>
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 6ba46a8fdb4d..5897e3af67fc 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -4847,6 +4847,7 @@
<java-symbol type="array" name="config_deviceStatesAvailableForAppRequests" />
<java-symbol type="array" name="config_serviceStateLocationAllowedPackages" />
<java-symbol type="integer" name="config_deviceStateRearDisplay"/>
+ <java-symbol type="bool" name="config_independentLockscreenLiveWallpaper"/>
<!-- For app language picker -->
<java-symbol type="string" name="system_locale_title" />