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

Commit f6b6ea6b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Flip the lockscreen live wallpaper flag" into udc-qpr-dev am:... 

Merge "Merge "Flip the lockscreen live wallpaper flag" into udc-qpr-dev am: ce48e229" into udc-qpr-dev-plus-aosp am: f7e4f4ee

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



Change-Id: Ibbab629c7c6485f95a3e56f8a688fc04db7407a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26fb685a f7e4f4ee

core/java/android/app/WallpaperManager.java

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ public class WallpaperManager { 
    private static boolean isLockscreenLiveWallpaperEnabledHelper() {

        if (sGlobals == null) {

            sIsLockscreenLiveWallpaperEnabled = SystemProperties.getBoolean(

                    "persist.wm.debug.lockscreen_live_wallpaper", false);

                    "persist.wm.debug.lockscreen_live_wallpaper", true);

        }

        if (sIsLockscreenLiveWallpaperEnabled == null) {

            try {

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ object Flags { 
    // TODO(b/273443374): Tracking Bug

    @Keep

    @JvmField val LOCKSCREEN_LIVE_WALLPAPER =

        sysPropBooleanFlag(1117, "persist.wm.debug.lockscreen_live_wallpaper", default = false)

        sysPropBooleanFlag(1117, "persist.wm.debug.lockscreen_live_wallpaper", default = true)



    // TODO(b/281648899): Tracking bug

    @Keep

services/core/java/com/android/server/wallpaper/WallpaperDataParser.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ class WallpaperDataParser { 
        mImageWallpaper = ComponentName.unflattenFromString(

                context.getResources().getString(R.string.image_wallpaper_component));

        mIsLockscreenLiveWallpaperEnabled =

                SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false);

                SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", true);

    }



    private JournaledFile makeJournaledFile(int userId) {

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1604,7 +1604,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                mWallpaperCropper);



        mIsLockscreenLiveWallpaperEnabled =

                SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false);

                SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", true);

        mIsMultiCropEnabled =

                SystemProperties.getBoolean("persist.wm.debug.wallpaper_multi_crop", false);

        LocalServices.addService(WallpaperManagerInternal.class, new LocalService());

services/core/java/com/android/server/wm/WallpaperController.java

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ class WallpaperController { 
                resources.getBoolean(

                        com.android.internal.R.bool.config_offsetWallpaperToCenterOfLargestDisplay);

        mIsLockscreenLiveWallpaperEnabled =

                SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false);

                SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", true);

    }



    void resetLargestDisplay(Display display) {