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

Merge "Handle empty bigTexts more gracefully" into nyc-dev

Browse Source 
am: 1689203

* commit '1689203d5cc33c2490169d7998cf3ffbeb5d35fc':
  Handle empty bigTexts more gracefully

Change-Id: I2ddfd7978b500237e2fe0a213add3a70ebada470
This commit is contained in:
Selim Cinek
2016-04-27 23:05:26 +00:00
committed by android-build-merger
parent 4b86c078a5 1689203d5c
commit a46a403687
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

@@ -4268,15 +4268,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);