Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle empty bigTexts more gracefully

Browse Source 
We're now falling back to the normal text if the bigtext is empty

Bug: 28318145
Change-Id: I5da237780407b62d21f79f7a754736ae1e4a8785
This commit is contained in:
Selim Cinek
2016-04-26 10:39:17 -07:00
parent 31d37b9186
commit 7599878c8a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/Notification.java
View File

@@ -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);