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

Merge "Fix MessagingStyle HUNs" into nyc-dev

Browse Source 
am: 5aa8e7d

* commit '5aa8e7d1f12f78dde892bdc6698550e8d1c558c4':
  Fix MessagingStyle HUNs

Change-Id: I0e2085ed56a43146164ece5186c111e56027526f
This commit is contained in:
Adrian Roos
2016-04-27 23:46:20 +00:00
committed by android-build-merger
parent 2a00cf3d78 5aa8e7d1f1
commit 79a9cb95e5
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4468,8 +4468,8 @@ public class Notification implements Parcelable
mAllowGeneratedReplies = extras.getBoolean(EXTRA_ALLOW_GENERATED_REPLIES,
mAllowGeneratedReplies);
Parcelable[] parcelables = extras.getParcelableArray(EXTRA_MESSAGES);
if (parcelables != null && parcelables instanceof Bundle[]) {
mMessages = Message.getMessagesFromBundleArray((Bundle[]) parcelables);
if (parcelables != null && parcelables instanceof Parcelable[]) {
mMessages = Message.getMessagesFromBundleArray(parcelables);
}
}
@@ -4565,6 +4565,25 @@ public class Notification implements Parcelable
return sb;
}
/**
* @hide
*/
@Override
public RemoteViews makeHeadsUpContentView() {
Message m = findLatestIncomingMessage();
CharSequence title = mConversationTitle != null
? mConversationTitle
: (m == null) ? null : m.mSender;
CharSequence text = (m == null)
? null
: mConversationTitle != null ? makeMessageLine(m) : m.mText;
return mBuilder.applyStandardTemplateWithActions(mBuilder.getBigBaseLayoutResource(),
false /* hasProgress */,
title,
text);
}
private static TextAppearanceSpan makeFontColorSpan(int color) {
return new TextAppearanceSpan(null, 0, 0,
ColorStateList.valueOf(color), null);
@@ -4698,12 +4717,14 @@ public class Notification implements Parcelable
return bundles;
}
static List<Message> getMessagesFromBundleArray(Bundle[] bundles) {
static List<Message> getMessagesFromBundleArray(Parcelable[] bundles) {
List<Message> messages = new ArrayList<>(bundles.length);
for (int i = 0; i < bundles.length; i++) {
Message message = getMessageFromBundle(bundles[i]);
if (message != null) {
messages.add(message);
if (bundles[i] instanceof Bundle) {
Message message = getMessageFromBundle((Bundle)bundles[i]);
if (message != null) {
messages.add(message);
}
}
}
return messages;