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

Commit 80c05761 authored by Chris Poultney's avatar Chris Poultney Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I75f271d71472d63713d97751f6a439b0db36f6de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5e1aa95 cb69035c

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -5915,4 +5915,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
@@ -4870,6 +4870,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" />