summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
index 9419b673fc6e..bd885da30731 100644
--- a/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
@@ -369,10 +369,10 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
break;
}
if (mTriStateMode != -1) {
- if (mTriStateIcon != null) {
+ if (mTriStateIcon != null && iconId != 0) {
mTriStateIcon.setImageResource(iconId);
}
- if (mTriStateText != null) {
+ if (mTriStateText != null && textId != 0) {
String inputText = res.getString(textId);
if (inputText != null && mTriStateText.length() == inputText.length()) {
StringBuilder sb = new StringBuilder();
@@ -382,7 +382,7 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
}
mTriStateText.setText(inputText);
}
- if (mDialogView != null) {
+ if (mDialogView != null && bg != 0) {
mDialogView.setBackgroundDrawable(res.getDrawable(bg));
}
mDialogPosition = positionY2;