summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-11-16 17:53:07 -0800
committerGilles Debunne <debunne@google.com>2010-11-16 18:21:29 -0800
commit4a0d0b34b244b5b730e861d875e7ae289cbb3311 (patch)
tree8a73a3ebf2e7a23e6336aabf6792c1b2b5f668be
parentbe26d055c9c340f9c549447bb4ee89c21fd6d714 (diff)
downloadframeworks_base-4a0d0b34b244b5b730e861d875e7ae289cbb3311.zip
frameworks_base-4a0d0b34b244b5b730e861d875e7ae289cbb3311.tar.gz
frameworks_base-4a0d0b34b244b5b730e861d875e7ae289cbb3311.tar.bz2
Fix for disappearing background in buttons.
Change-Id: I7c7058ee8a292e73c25ba8c3e8d46899b7296c1e
-rw-r--r--core/java/android/widget/TextView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index aefe8d8..f32ae92 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6206,7 +6206,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (applyTransformation) {
setTransformationMethod(null);
}
- setBackgroundDrawable(mEditTextMultilineBackground);
+ // mEditTextMultilineBackground is defined and used only in EditText
+ if (mEditTextMultilineBackground != null) {
+ setBackgroundDrawable(mEditTextMultilineBackground);
+ }
}
}