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

Commit ea35a292 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Show big text on AoD" into oc-mr1-dev am: a4996f24 

am: c86252c1

Change-Id: I51d691cd2cec04cd9c0b979a87914e9b4cde49ce
parents f91ebf54 c86252c1

core/java/android/app/Notification.java

+9 −2
Original line number Diff line number Diff line
@@ -8522,8 +8522,15 @@ public class Notification implements Parcelable 


        final StandardTemplateParams fillTextsFrom(Builder b) {

            Bundle extras = b.mN.extras;

            title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE), ambient);

            text = b.processLegacyText(extras.getCharSequence(EXTRA_TEXT), ambient);

            this.title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE), ambient);



            // Big text notifications should contain their content when viewed in ambient mode.

            CharSequence text = extras.getCharSequence(EXTRA_BIG_TEXT);

            if (!ambient || TextUtils.isEmpty(text)) {

                text = extras.getCharSequence(EXTRA_TEXT);

            }

            this.text = b.processLegacyText(text, ambient);



            return this;

        }

    }