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

Commit c8f8b28b authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev am: 13e74f97 

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



Change-Id: I9193221f70a9c33221e95148fff4ad3c6befbe35
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fe78f64 13e74f97

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -840,8 +840,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 




                @Override

                @Override

                public void onLaunchAnimationCancelled() {

                public void onLaunchAnimationCancelled() {

                    Log.d(TAG, "Occlude launch animation cancelled. "

                    setOccluded(true /* occluded */, false /* animate */);

                            + "Occluded state is now: " + mOccluded);

                    Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: "

                            + mOccluded);

                }

                }





                @NonNull

                @NonNull
@@ -904,6 +905,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                    if (mUnoccludeAnimator != null) {

                    if (mUnoccludeAnimator != null) {

                        mUnoccludeAnimator.cancel();

                        mUnoccludeAnimator.cancel();

                    }

                    }



                    setOccluded(false /* isOccluded */, false /* animate */);

                    Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "

                            + mOccluded);

                }

                }





                @Override

                @Override