Merge "Correct SHOW_WALLPAPER conflicts the definition of isTranslucent" into tm-qpr-dev am: 334a4be176

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

Change-Id: I9abf281388035425cbb5181a60c5660844e654f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2022-07-29 13:22:52 +00:00
committed by Automerger Merge Worker

View File

@@ -205,8 +205,7 @@ public class RemoteAnimationTargetCompat {
// TODO: once we can properly sync transactions across process, then get rid of this leash. // TODO: once we can properly sync transactions across process, then get rid of this leash.
leash = createLeash(info, change, order, t); leash = createLeash(info, change, order, t);
isTranslucent = (change.getFlags() & TransitionInfo.FLAG_TRANSLUCENT) != 0 isTranslucent = (change.getFlags() & TransitionInfo.FLAG_TRANSLUCENT) != 0;
|| (change.getFlags() & TransitionInfo.FLAG_SHOW_WALLPAPER) != 0;
clipRect = null; clipRect = null;
position = null; position = null;
localBounds = new Rect(change.getEndAbsBounds()); localBounds = new Rect(change.getEndAbsBounds());