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

Merge "Fix broken actions with MessagingStyle" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-13 00:54:30 +00:00
committed by Android (Google) Code Review
parent 4c3dcc0a16 48d746ab32
commit 4ecc0ce387
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3308,7 +3308,16 @@ public class Notification implements Parcelable
}
private RemoteViews applyStandardTemplateWithActions(int layoutId) {
RemoteViews big = applyStandardTemplate(layoutId);
final Bundle ex = mN.extras;
CharSequence title = processLegacyText(ex.getCharSequence(EXTRA_TITLE));
CharSequence text = processLegacyText(ex.getCharSequence(EXTRA_TEXT));
return applyStandardTemplateWithActions(layoutId, true /* hasProgress */, title, text);
}
private RemoteViews applyStandardTemplateWithActions(int layoutId, boolean hasProgress,
CharSequence title, CharSequence text) {
RemoteViews big = applyStandardTemplate(layoutId, hasProgress, title, text);
resetStandardTemplateWithActions(big);
@@ -4429,7 +4438,7 @@ public class Notification implements Parcelable
: mConversationTitle;
boolean hasTitle = !TextUtils.isEmpty(title);
RemoteViews contentView = mBuilder.applyStandardTemplate(
RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(
mBuilder.getMessagingLayoutResource(),
false /* hasProgress */,
title,