From 7599878c8a777eb52a14a43a6d63b799fe3bc53b Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Tue, 26 Apr 2016 10:39:17 -0700 Subject: Handle empty bigTexts more gracefully We're now falling back to the normal text if the bigtext is empty Bug: 28318145 Change-Id: I5da237780407b62d21f79f7a754736ae1e4a8785 --- core/java/android/app/Notification.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 7230a9195d28..9a2cd0042a34 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4264,15 +4264,19 @@ public class Notification implements Parcelable public RemoteViews makeBigContentView() { // Nasty - CharSequence oldBuilderContentText = - mBuilder.getAllExtras().getCharSequence(EXTRA_TEXT); + CharSequence text = mBuilder.getAllExtras().getCharSequence(EXTRA_TEXT); mBuilder.getAllExtras().putCharSequence(EXTRA_TEXT, null); RemoteViews contentView = getStandardView(mBuilder.getBigTextLayoutResource()); - mBuilder.getAllExtras().putCharSequence(EXTRA_TEXT, oldBuilderContentText); + mBuilder.getAllExtras().putCharSequence(EXTRA_TEXT, text); CharSequence bigTextText = mBuilder.processLegacyText(mBigText); + if (TextUtils.isEmpty(bigTextText)) { + // In case the bigtext is null / empty fall back to the normal text to avoid a weird + // experience + bigTextText = mBuilder.processLegacyText(text); + } contentView.setTextViewText(R.id.big_text, bigTextText); contentView.setViewVisibility(R.id.big_text, TextUtils.isEmpty(bigTextText) ? View.GONE : View.VISIBLE); -- cgit v1.2.3-59-g8ed1b