commit 51f3ef904aa6f8de4a8030666f90ff2290e1f7e8
author Santos Cordon <santoscordon@google.com> Mon Jan 28 11:37:39 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 28 11:37:39 2013 -0800
tree c0d53ae293d95d238c809a8c61cf3356e38cf788
parent ac6babd5144c63c6233b291972c81e0fd50c10e7
parent a1e530fd2abb9c2e394dab466f404dc5f12f94fc

am a1e530fd: Merge "Phone: IncomingCallWidget shows indefinitely sometimes."

# By Bin Li
# Via Bin Li (1) and Gerrit Code Review (1)
* commit 'a1e530fd2abb9c2e394dab466f404dc5f12f94fc':
  Phone: IncomingCallWidget shows indefinitely sometimes.

src/com/android/phone/InCallTouchUi.java

diff --git a/src/com/android/phone/InCallTouchUi.java b/src/com/android/phone/InCallTouchUi.java
index 986765e..a36fc14 100644
--- a/src/com/android/phone/InCallTouchUi.java
+++ b/src/com/android/phone/InCallTouchUi.java
@@ -1164,6 +1164,10 @@
         ViewPropertyAnimator animator = mIncomingCallWidget.animate();
         if (animator != null) {
             animator.cancel();
+            // If animation is cancelled before it's running,
+            // onAnimationCancel will not be called and mIncomingCallWidgetIsFadingOut
+            // will be alway true. hideIncomingCallWidget() will not be excuted in this case.
+            mIncomingCallWidgetIsFadingOut = false;
         }
         mIncomingCallWidget.setAlpha(1.0f);