Merge "Revert "Avoid calling updateSurface twice when dimming is applied."" into tm-dev am: 05aa78241d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231745 Change-Id: If48c65e78a06aa1eb6755d9315524c6b4c650c8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -904,6 +904,7 @@ public abstract class WallpaperService extends Service {
|
|||||||
// based on its default wallpaper color hints.
|
// based on its default wallpaper color hints.
|
||||||
mShouldDim = dimAmount != 0f || mShouldDimByDefault;
|
mShouldDim = dimAmount != 0f || mShouldDimByDefault;
|
||||||
updateSurfaceDimming();
|
updateSurfaceDimming();
|
||||||
|
updateSurface(false, false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateSurfaceDimming() {
|
private void updateSurfaceDimming() {
|
||||||
@@ -940,7 +941,6 @@ public abstract class WallpaperService extends Service {
|
|||||||
} else {
|
} else {
|
||||||
Log.v(TAG, "Setting wallpaper dimming: " + 0);
|
Log.v(TAG, "Setting wallpaper dimming: " + 0);
|
||||||
surfaceControlTransaction.setAlpha(mBbqSurfaceControl, 1.0f).apply();
|
surfaceControlTransaction.setAlpha(mBbqSurfaceControl, 1.0f).apply();
|
||||||
updateSurface(false, false, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mPreviousWallpaperDimAmount = mWallpaperDimAmount;
|
mPreviousWallpaperDimAmount = mWallpaperDimAmount;
|
||||||
|
|||||||
Reference in New Issue
Block a user