summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-09-05 03:24:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-05 03:24:47 -0700
commit7a397e0468310e75f39d93fadcd43b7224c9e0c5 (patch)
tree4c47c0b5a3bd0fbe83f8e8b2e76e9d94bf4dc0ec /src
parent215b416c1f7cf0234b777155b823637a0902739f (diff)
parent059798af0927ade335bd9ed7a552798b17690bd8 (diff)
downloadandroid_packages_apps_Trebuchet-7a397e0468310e75f39d93fadcd43b7224c9e0c5.tar.gz
android_packages_apps_Trebuchet-7a397e0468310e75f39d93fadcd43b7224c9e0c5.tar.bz2
android_packages_apps_Trebuchet-7a397e0468310e75f39d93fadcd43b7224c9e0c5.zip
Merge "Debug code for bug b/6830207" into jb-mr1-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2fcf86925..ab361f12f 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2474,6 +2474,9 @@ public final class Launcher extends Activity
alphaAnim.addUpdateListener(new AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
+ if (animation == null) {
+ throw new RuntimeException("animation is null");
+ }
float t = (Float) animation.getAnimatedValue();
dispatchOnLauncherTransitionStep(fromView, t);
dispatchOnLauncherTransitionStep(toView, t);