summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-06-07 00:40:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-07 00:40:41 +0000
commitc094a3accb1ce29d5b87ee3d1641a033e129b6d6 (patch)
treed86e6031b0ee03c5691e12f28f1f6788e08291c4
parent15fcdbed076e271e047a0f3a2b2ddd2511ce9fd4 (diff)
parentbd867a3d3e3f5f9709c0fd813dfbd025a74df2f3 (diff)
downloadandroid_packages_apps_Trebuchet-c094a3accb1ce29d5b87ee3d1641a033e129b6d6.tar.gz
android_packages_apps_Trebuchet-c094a3accb1ce29d5b87ee3d1641a033e129b6d6.tar.bz2
android_packages_apps_Trebuchet-c094a3accb1ce29d5b87ee3d1641a033e129b6d6.zip
Merge "Don't use CharSequence as notification text" into ub-launcher3-dorval-polish
-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(),