summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-02-09 18:50:08 -0800
committerJim Miller <jaggies@google.com>2010-02-17 21:12:47 -0800
commit67e9e9df929aad9139f1dc776b15f6c5d64f424e (patch)
treefd115616ba90fd669b89d05282ca4593bbbe1a6d
parent8368ef0b670f8193f3161671b119e78b1fb659a1 (diff)
downloadframeworks_base-67e9e9df929aad9139f1dc776b15f6c5d64f424e.zip
frameworks_base-67e9e9df929aad9139f1dc776b15f6c5d64f424e.tar.gz
frameworks_base-67e9e9df929aad9139f1dc776b15f6c5d64f424e.tar.bz2
Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
Fix the lock screen.
-rw-r--r--core/java/android/view/View.java2
-rw-r--r--core/java/android/view/animation/Animation.java10
2 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 94ff15e..da48f40 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8192,7 +8192,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
*/
public void clearAnimation() {
if (mCurrentAnimation != null) {
- mCurrentAnimation.cancel();
+ mCurrentAnimation.detach();
}
mCurrentAnimation = null;
}
diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java
index 3e107df..16a695f 100644
--- a/core/java/android/view/animation/Animation.java
+++ b/core/java/android/view/animation/Animation.java
@@ -278,6 +278,16 @@ public abstract class Animation implements Cloneable {
}
/**
+ * @hide
+ */
+ public void detach() {
+ if (mStarted && !mEnded) {
+ if (mListener != null) mListener.onAnimationEnd(this);
+ mEnded = true;
+ }
+ }
+
+ /**
* Whether or not the animation has been initialized.
*
* @return Has this animation been initialized.