Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48d746ab authored by Adrian Roos's avatar Adrian Roos
Browse files

Fix broken actions with MessagingStyle

Bug: 27250207
Change-Id: I073bb0ef055423a6c152af0e98fe846b15511d11
parent 5dc3c674
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -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,