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

Commit 471a8d36 authored by Vania Desmonda's avatar Vania Desmonda Committed by Automerger Merge Worker
Browse files

Merge "Revert "Avoid calling updateSurface twice when dimming is applied.""... 

Merge "Revert "Avoid calling updateSurface twice when dimming is applied."" into tm-dev am: 05aa7824 am: 57ebaf04 am: 887f5010

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



Change-Id: I71166dadf33b25c3131eada954dd656e89445dc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71bb98fd 887f5010

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -904,6 +904,7 @@ public abstract class WallpaperService extends Service { 
            // based on its default wallpaper color hints.

            mShouldDim = dimAmount != 0f || mShouldDimByDefault;

            updateSurfaceDimming();

            updateSurface(false, false, true);

        }



        private void updateSurfaceDimming() {
@@ -940,7 +941,6 @@ public abstract class WallpaperService extends Service { 
            } else {

                Log.v(TAG, "Setting wallpaper dimming: " + 0);

                surfaceControlTransaction.setAlpha(mBbqSurfaceControl, 1.0f).apply();

                updateSurface(false, false, true);

            }



            mPreviousWallpaperDimAmount = mWallpaperDimAmount;