diff options
| author | Martijn Coenen <maco@google.com> | 2011-11-05 16:39:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-05 16:39:58 +0000 |
| commit | 9390cc0d7838d585f23b1d701a594394600495dd (patch) | |
| tree | 7689ec7b7a3821ef8827ef987f1e97ccbd185c8b | |
| parent | 967f455dee34efe161543bd2e1ad6f9c475f9d18 (diff) | |
| parent | 304a7304fe4aeab2b915024a531238f1c3f246a8 (diff) | |
| download | packages_apps_nfc-9390cc0d7838d585f23b1d701a594394600495dd.zip packages_apps_nfc-9390cc0d7838d585f23b1d701a594394600495dd.tar.gz packages_apps_nfc-9390cc0d7838d585f23b1d701a594394600495dd.tar.bz2 | |
am 304a7304: Merge "Don\'t finish Beam animation again." into ics-mr1
* commit '304a7304fe4aeab2b915024a531238f1c3f246a8':
Don't finish Beam animation again.
| -rw-r--r-- | src/com/android/nfc/P2pEventManager.java | 4 | ||||
| -rw-r--r-- | src/com/android/nfc/SendUi.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/nfc/P2pEventManager.java b/src/com/android/nfc/P2pEventManager.java index 18ec8ae..9273afa 100644 --- a/src/com/android/nfc/P2pEventManager.java +++ b/src/com/android/nfc/P2pEventManager.java @@ -110,7 +110,9 @@ public class P2pEventManager implements P2pEventListener, SendUi.Callback { playSound(mErrorSound); mSending = false; } - mSendUi.finish(SendUi.FINISH_SCALE_UP); + if (!mNdefSent && !mNdefReceived) { + mSendUi.finish(SendUi.FINISH_SCALE_UP); + } } @Override diff --git a/src/com/android/nfc/SendUi.java b/src/com/android/nfc/SendUi.java index 37c8cfc..1d2230a 100644 --- a/src/com/android/nfc/SendUi.java +++ b/src/com/android/nfc/SendUi.java @@ -356,6 +356,9 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, if (!mAttached) { return; } + // Immediately set to false, to prevent .cancel() calls + // below from immediately calling into dismiss() again. + mAttached = false; mPreAnimator.cancel(); mSlowSendAnimator.cancel(); mFastCloneAnimator.cancel(); @@ -363,7 +366,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, mScaleUpAnimator.cancel(); mWindowManager.removeView(mScreenshotLayout); mStatusBarManager.disable(StatusBarManager.DISABLE_NONE); - mAttached = false; releaseScreenshot(); } |