commit c0bd58837acbb7e7e879437192b818e03ac02ff3
author Winson Chung <winsonc@google.com> Thu Nov 18 15:08:06 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 18 15:08:06 2010 -0800
tree 6e9d8edd73aae3b2028ce0d6e4660c942929f2d2
parent b4b7fa7c0383b6af58d73d3e024b91d586148cf8
parent 13fe1fdcd6d34e52de0f097edad47119650090dc

Merge "Fixing proguard related crash due to striping animation callbacks."

res/drawable-xlarge/all_apps_bg_gradient.9.png

diff --git a/res/drawable/all_apps_bg_gradient.9.png b/res/drawable-xlarge/all_apps_bg_gradient.9.png
similarity index 100%
rename from res/drawable/all_apps_bg_gradient.9.png
rename to res/drawable-xlarge/all_apps_bg_gradient.9.png
Binary files differ

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index a898177..7a264e3 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -245,8 +245,12 @@
         mExternalDragOutlinePaint.setAntiAlias(true);
         setWillNotDraw(false);
 
-        final Resources res = getResources();
-        mBackground = res.getDrawable(R.drawable.all_apps_bg_gradient);
+        try {
+            final Resources res = getResources();
+            mBackground = res.getDrawable(R.drawable.all_apps_bg_gradient);
+        } catch (Resources.NotFoundException e) {
+            // In this case, we will skip drawing background protection
+        }
 
         mUnshrinkAnimationListener = new LauncherAnimatorListenerAdapter() {
             @Override
@@ -583,6 +587,7 @@
     }
 
     public void showBackgroundGradient() {
+        if (mBackground == null) return;
         if (mBackgroundFadeOutAnimation != null) mBackgroundFadeOutAnimation.cancel();
         if (mBackgroundFadeInAnimation != null) mBackgroundFadeInAnimation.cancel();
         mBackgroundFadeInAnimation = ObjectAnimator.ofFloat(this, "backgroundAlpha", 1.0f);
@@ -591,6 +596,7 @@
     }
 
     public void hideBackgroundGradient() {
+        if (mBackground == null) return;
         if (mBackgroundFadeInAnimation != null) mBackgroundFadeInAnimation.cancel();
         if (mBackgroundFadeOutAnimation != null) mBackgroundFadeOutAnimation.cancel();
         mBackgroundFadeOutAnimation = ObjectAnimator.ofFloat(this, "backgroundAlpha", 0.0f);
@@ -683,7 +689,7 @@
     @Override
     protected void onDraw(Canvas canvas) {
         // Draw the background gradient if necessary
-        if (mBackgroundAlpha > 0.0f) {
+        if (mBackground != null && mBackgroundAlpha > 0.0f) {
             mBackground.setAlpha((int) (mBackgroundAlpha * 255));
             mBackground.setBounds(mScrollX, 0, mScrollX + getMeasuredWidth(), getMeasuredHeight());
             mBackground.draw(canvas);