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

Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-01 17:01:58 +00:00
committed by Android (Google) Code Review
parent 0d7dbb0f28 33fbd2c965
commit ff39d3ec2f
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4479,6 +4479,35 @@ public class Notification implements Parcelable
if (!mMessages.isEmpty()) { extras.putParcelableArray(EXTRA_MESSAGES,
Message.getBundleArrayForMessages(mMessages));
}
fixTitleAndTextExtras(extras);
}
private void fixTitleAndTextExtras(Bundle extras) {
Message m = findLatestIncomingMessage();
CharSequence text = (m == null) ? null : m.mText;
CharSequence sender = m == null ? null
: TextUtils.isEmpty(m.mSender) ? mUserDisplayName : m.mSender;
CharSequence title;
if (!TextUtils.isEmpty(mConversationTitle)) {
if (!TextUtils.isEmpty(sender)) {
BidiFormatter bidi = BidiFormatter.getInstance();
title = mBuilder.mContext.getString(
com.android.internal.R.string.notification_messaging_title_template,
bidi.unicodeWrap(mConversationTitle), bidi.unicodeWrap(m.mSender));
} else {
title = mConversationTitle;
}
} else {
title = sender;
}
if (title != null) {
extras.putCharSequence(EXTRA_TITLE, title);
}
if (text != null) {
extras.putCharSequence(EXTRA_TEXT, text);
}
}
/**
@@ -4524,6 +4553,10 @@ public class Notification implements Parcelable
return m;
}
}
if (!mMessages.isEmpty()) {
// No incoming messages, fall back to outgoing message
return mMessages.get(mMessages.size() - 1);
}
return null;
}