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

Commit fd811417 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Correct SHOW_WALLPAPER conflicts the definition of isTranslucent" into... 

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

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



Change-Id: Id6a7daa6a02aae7509aa2e3b4e83761bb638b4f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fab2357 09a3c1fa

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java

+1 −2
Original line number Diff line number Diff line
@@ -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());