commit 6323a55fe25789b84fa60d5eeb78c7abff6b0ccd
author Winson Chung <winsonc@google.com> Wed Sep 05 19:06:31 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 05 19:06:31 2012 -0700
tree 83c10272741a15805486e3e6beccb6066b8a8ed0
parent 7a397e0468310e75f39d93fadcd43b7224c9e0c5
parent 8a4351063f02c0e8d64ee3ace651b227e9f8321f

Merge "Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)" into jb-mr1-dev

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index d83fcac..f742255 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -1026,7 +1026,7 @@
         super.onSizeChanged(w, h, oldw, oldh);
         mBackgroundRect.set(0, 0, w, h);
         mForegroundRect.set(mForegroundPadding, mForegroundPadding,
-                w - 2 * mForegroundPadding, h - 2 * mForegroundPadding);
+                w - mForegroundPadding, h - mForegroundPadding);
     }
 
     @Override

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2fcf869..ab361f1 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2474,6 +2474,9 @@
             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);