Merge "Correct SHOW_WALLPAPER conflicts the definition of isTranslucent" into tm-qpr-dev am: 334a4be176 am: 09a3c1fa90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19033154 Change-Id: Id6a7daa6a02aae7509aa2e3b4e83761bb638b4f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -205,8 +205,7 @@ public class RemoteAnimationTargetCompat {
|
||||
// TODO: once we can properly sync transactions across process, then get rid of this leash.
|
||||
leash = createLeash(info, change, order, t);
|
||||
|
||||
isTranslucent = (change.getFlags() & TransitionInfo.FLAG_TRANSLUCENT) != 0
|
||||
|| (change.getFlags() & TransitionInfo.FLAG_SHOW_WALLPAPER) != 0;
|
||||
isTranslucent = (change.getFlags() & TransitionInfo.FLAG_TRANSLUCENT) != 0;
|
||||
clipRect = null;
|
||||
position = null;
|
||||
localBounds = new Rect(change.getEndAbsBounds());
|
||||
|
||||
Reference in New Issue
Block a user