summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-06-03 21:43:24 -0700
committerAdam Cohen <adamcohen@google.com>2014-06-04 04:48:48 +0000
commit18bbc6a013e10b1fe384b7d3798622e087c813d2 (patch)
tree90e8dc8e7e6d916722db25f9927c5f882286a4d1 /src
parente9a5119836e5e3310c474cb4bb5b7a727bc2415f (diff)
downloadandroid_packages_apps_Trebuchet-18bbc6a013e10b1fe384b7d3798622e087c813d2.tar.gz
android_packages_apps_Trebuchet-18bbc6a013e10b1fe384b7d3798622e087c813d2.tar.bz2
android_packages_apps_Trebuchet-18bbc6a013e10b1fe384b7d3798622e087c813d2.zip
Adding workaround for issue with null drawable
A drawable is null which ought not be null, since it should have been set during inflation. Seems like a platform issue on one device. Adding a workaround to manually set it in code after inflation if necessary. issue 15334203 Change-Id: Ideb80c231300e61f6dfe5336d6d647a3e1b51817
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/InfoDropTarget.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index 374238c49..fb623ca1e 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -49,6 +49,13 @@ public class InfoDropTarget extends ButtonDropTarget {
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);
}