commit 8739de663cb29fcf3bd8ad7322eb35b2bea20fb6
author Adam Cohen <adamcohen@google.com> Wed Jun 04 05:09:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 04 05:09:37 2014 +0000
tree dde7f2cc2df33a6a6e18bee546dd695d3904bc3a
parent 6bd73154c5f79208aa0fc3ea987847f0b465d319
parent 18bbc6a013e10b1fe384b7d3798622e087c813d2

am 18bbc6a0: Adding workaround for issue with null drawable

* commit '18bbc6a013e10b1fe384b7d3798622e087c813d2':
  Adding workaround for issue with null drawable

src/com/android/launcher3/InfoDropTarget.java

diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index 374238c..fb623ca 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -49,6 +49,13 @@
         Resources r = getResources();
         mHoverColor = r.getColor(R.color.info_target_hover_tint);
         mDrawable = (TransitionDrawable) getCurrentDrawable();
+
+        if (mDrawable == null) {
+            // TODO: investigate why this is ever happening. Presently only on one known device.
+            mDrawable = r.getDrawable(R.drawable.info_target_selector);
+            setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null);
+        }
+
         if (null != mDrawable) {
             mDrawable.setCrossFadeEnabled(true);
         }