commit ed11c14003ca4ae5f702b6eb3f6b5dd8f4e7d4a4
author Adam Cohen <adamcohen@google.com> Tue Jun 03 18:03:29 2014 -0700
committer Adam Cohen <adamcohen@google.com> Tue Jun 03 18:11:15 2014 -0700
tree f0a7829bbaf47a76ebd466f8ce245ad91d6ca76b
parent 3489f5c1bf0a3b036479b440b917123016568fc7

Adding debugging and naive fix for issue 15334203

-> To be reverted, just need signed build.

Change-Id: I6a83e55067d8d2564bb3c4f0c314befbb2793f09

src/com/android/launcher3/ButtonDropTarget.java

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 019f86c..e466e10 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -75,6 +75,7 @@
                 return drawables[i];
             }
         }
+        System.out.println("No drawable, returning null " + this);
         return null;
     }
 

src/com/android/launcher3/InfoDropTarget.java

diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index 374238c..254d9bf 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -21,6 +21,7 @@
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.util.AttributeSet;
 import android.view.View;
@@ -49,6 +50,19 @@
         Resources r = getResources();
         mHoverColor = r.getColor(R.color.info_target_hover_tint);
         mDrawable = (TransitionDrawable) getCurrentDrawable();
+
+        if (mDrawable == null) {
+            System.out.println("onFinishInflate -- drawable null");
+        }
+
+        // DEBUG CODE:
+        Drawable normal = r.getDrawable(R.drawable.ic_launcher_info_normal_holo);
+        Drawable active = r.getDrawable(R.drawable.ic_launcher_info_active_holo);
+        Drawable selector = r.getDrawable(R.drawable.info_target_selector);
+        System.out.println("Normal: " + normal);
+        System.out.println("Active: " + active);
+        System.out.println("Selector: " + selector);
+
         if (null != mDrawable) {
             mDrawable.setCrossFadeEnabled(true);
         }
@@ -93,8 +107,14 @@
             isVisible = false;
         }
 
+        if (mDrawable == null) {
+            System.out.println("onDragStart -- drawable null");
+        }
+
         mActive = isVisible;
-        mDrawable.resetTransition();
+        if (mDrawable != null) {
+            mDrawable.resetTransition();
+        }
         setTextColor(mOriginalTextColor);
         ((ViewGroup) getParent()).setVisibility(isVisible ? View.VISIBLE : View.GONE);
     }
@@ -108,7 +128,9 @@
     public void onDragEnter(DragObject d) {
         super.onDragEnter(d);
 
-        mDrawable.startTransition(mTransitionDuration);
+        if (mDrawable != null) {
+            mDrawable.startTransition(mTransitionDuration);
+        }
         setTextColor(mHoverColor);
     }