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

Commit c86252c1 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

Change-Id: Iad619b9585fd3e0859e3588cc5d6dbb604f763e7
parents 5b847663 a4996f24

core/java/android/app/Notification.java

+9 −2
Original line number Diff line number Diff line
@@ -8515,8 +8515,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;

        }

    }