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

Merge "Show big text on AoD" into oc-mr1-dev

Browse Source 
am: a4996f241f

Change-Id: Iad619b9585fd3e0859e3588cc5d6dbb604f763e7
This commit is contained in:
Lucas Dupin
2017-09-14 22:32:57 +00:00
committed by android-build-merger
parent 5b8476637d a4996f241f
commit c86252c1dc
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8515,8 +8515,15 @@ public class Notification implements Parcelable
final StandardTemplateParams fillTextsFrom(Builder b) {
Bundle extras = b.mN.extras;
title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE), ambient);
text = b.processLegacyText(extras.getCharSequence(EXTRA_TEXT), ambient);
this.title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE), ambient);
// Big text notifications should contain their content when viewed in ambient mode.
CharSequence text = extras.getCharSequence(EXTRA_BIG_TEXT);
if (!ambient || TextUtils.isEmpty(text)) {
text = extras.getCharSequence(EXTRA_TEXT);
}
this.text = b.processLegacyText(text, ambient);
return this;
}
}