summaryrefslogtreecommitdiff
path: root/phone/com/android/internal/policy/impl/PhoneWindow.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-06-22 20:56:57 -0700
committerDianne Hackborn <hackbod@google.com>2009-06-22 20:56:57 -0700
commit72201963350da86a5c200196364e18cbee70b3a5 (patch)
tree3ace12c018de1d288771cfacb389ccac4aac056d /phone/com/android/internal/policy/impl/PhoneWindow.java
parent09ac6a4ea898221dfc338003683bb3a34f2d30a8 (diff)
downloadbase-72201963350da86a5c200196364e18cbee70b3a5.tar.gz
Fix issue #1806217.
We were not clearing the background drawable if it had been set as a resource reference.
Diffstat (limited to 'phone/com/android/internal/policy/impl/PhoneWindow.java')
-rw-r--r--phone/com/android/internal/policy/impl/PhoneWindow.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/phone/com/android/internal/policy/impl/PhoneWindow.java b/phone/com/android/internal/policy/impl/PhoneWindow.java
index b40255a..59c87a5 100644
--- a/phone/com/android/internal/policy/impl/PhoneWindow.java
+++ b/phone/com/android/internal/policy/impl/PhoneWindow.java
@@ -954,7 +954,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
@Override
public final void setBackgroundDrawable(Drawable drawable) {
- if (drawable != mBackgroundDrawable) {
+ if (drawable != mBackgroundDrawable || mBackgroundResource != 0) {
mBackgroundResource = 0;
mBackgroundDrawable = drawable;
if (mDecor != null) {