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

Commit 36feadc4 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

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

am: 4ecc0ce3

* commit '4ecc0ce3':
  Fix broken actions with MessagingStyle

Change-Id: I9cdff69b8931564190217bc0bfe4396954c4efa5
parents 4655cdd5 4ecc0ce3

core/java/android/app/Notification.java

+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,