Merge "Correct SHOW_WALLPAPER conflicts the definition of isTranslucent" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
334a4be176
@@ -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());
|
||||||
|
|||||||
Reference in New Issue
Block a user