projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update to ActionBarSherlock 4.1.0.
[debian/openrocket]
/
android-libraries
/
ActionBarSherlock
/
src
/
com
/
actionbarsherlock
/
internal
/
nineoldandroids
/
view
/
animation
/
AnimatorProxy.java
diff --git
a/android-libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
b/android-libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
index e284604bb35e69ca87124dc9ce7de167adc806e6..067d0494ee784a49001d43ec0662a5a471a3cd4d 100644
(file)
--- a/
android-libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
+++ b/
android-libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
@@
-140,6
+140,8
@@
public final class AnimatorProxy extends Animation {
return;
}
+ view.setAnimation(this);
+
final RectF after = mAfter;
computeRect(after, view);
after.union(mBefore);
@@
-202,4
+204,9
@@
public final class AnimatorProxy extends Animation {
transformMatrix(t.getMatrix(), view);
}
}
+
+ @Override
+ public void reset() {
+ /* Do nothing. */
+ }
}