summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-06-06 16:35:33 -0700
committerTony Wickham <twickham@google.com>2017-06-06 16:35:33 -0700
commitbd867a3d3e3f5f9709c0fd813dfbd025a74df2f3 (patch)
tree42b02a3f2a7b8dc38b2f716d6b2dc75b6ba3f9d2
parent561e53577b150d2f4a8d4c45931bd763f9fbd5ac (diff)
downloadandroid_packages_apps_Trebuchet-bd867a3d3e3f5f9709c0fd813dfbd025a74df2f3.tar.gz
android_packages_apps_Trebuchet-bd867a3d3e3f5f9709c0fd813dfbd025a74df2f3.tar.bz2
android_packages_apps_Trebuchet-bd867a3d3e3f5f9709c0fd813dfbd025a74df2f3.zip
Don't use CharSequence as notification text
If a notification changes the color etc. on the CharSequence, then it overrode our colors. Gmail for instance always makes the second text dark (apparently), overriding our dark theme. Change-Id: Ibd8751d70849fd10fd0114af02d382aba1771d4e
-rw-r--r--src/com/android/launcher3/notification/NotificationMainView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java
index 0d6da77ee..9b8dd648f 100644
--- a/src/com/android/launcher3/notification/NotificationMainView.java
+++ b/src/com/android/launcher3/notification/NotificationMainView.java
@@ -87,11 +87,11 @@ public class NotificationMainView extends FrameLayout implements SwipeHelper.Cal
CharSequence title = mNotificationInfo.title;
CharSequence text = mNotificationInfo.text;
if (!TextUtils.isEmpty(title) && !TextUtils.isEmpty(text)) {
- mTitleView.setText(title);
- mTextView.setText(text);
+ mTitleView.setText(title.toString());
+ mTextView.setText(text.toString());
} else {
mTitleView.setMaxLines(2);
- mTitleView.setText(TextUtils.isEmpty(title) ? text : title);
+ mTitleView.setText(TextUtils.isEmpty(title) ? text.toString() : title.toString());
mTextView.setVisibility(GONE);
}
iconView.setBackground(mNotificationInfo.getIconForBackground(getContext(),