Merge "Show big text on AoD" into oc-mr1-dev (a4996f24) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8515,8 +8515,15 @@ public class Notification implements Parcelable

	final StandardTemplateParams fillTextsFrom(Builder b) {		final StandardTemplateParams fillTextsFrom(Builder b) {
	Bundle extras = b.mN.extras;		Bundle extras = b.mN.extras;
	title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE), ambient);		this.title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE), ambient);
	text = b.processLegacyText(extras.getCharSequence(EXTRA_TEXT), 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;		return this;
	}		}
	}		}