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

Commit 222b4be0 authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge changes from topic "RemoteAnimationCanceled_with_Occluded-tm-dev" into... 

Merge changes from topic "RemoteAnimationCanceled_with_Occluded-tm-dev" into tm-dev am: 97641ffe am: 761057e6

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



Change-Id: I1109f69909da72cf8e7c25dbb728db69eba83d3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6829982 761057e6

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

+5 −3
Original line number Diff line number Diff line
@@ -843,7 +843,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 


                @Override

                public void onLaunchAnimationCancelled() {

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

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

                            + mOccluded);

                }
@@ -916,7 +915,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                        mUnoccludeAnimator.cancel();

                    }



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

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

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

                            + mOccluded);

                }
@@ -3214,7 +3213,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
        @Override

        public void onAnimationCancelled(boolean isKeyguardOccluded) throws RemoteException {

            super.onAnimationCancelled(isKeyguardOccluded);

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

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



            Log.d(TAG, "Occlude animation cancelled by WM. "

                    + "Setting occluded state to: " + mOccluded);

        }

    }

}