Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7934e3a3 authored Oct 18, 2022 by Chris Poultney Committed by Automerger Merge Worker Oct 18, 2022

Merge "Add a flag to enable independent lock screen live wallpaper" into...

Merge "Add a flag to enable independent lock screen live wallpaper" into tm-qpr-dev am: cb69035c am: 80c05761

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20165923

Change-Id: Ia4516e9361fc3a87201883511a9a77ef7df17aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c22d2ce2 80c05761

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -5933,4 +5933,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>

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -4892,6 +4892,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" />