Merge "Minor text fixes." into oc-dev (818c408e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationRecord.java

+14 −1

Original line number	Original line	Diff line number	Diff line
	@@ -376,7 +376,20 @@ public final class NotificationRecord {
	pw.println(prefix + "fullscreenIntent=" + notification.fullScreenIntent);		pw.println(prefix + "fullscreenIntent=" + notification.fullScreenIntent);
	pw.println(prefix + "contentIntent=" + notification.contentIntent);		pw.println(prefix + "contentIntent=" + notification.contentIntent);
	pw.println(prefix + "deleteIntent=" + notification.deleteIntent);		pw.println(prefix + "deleteIntent=" + notification.deleteIntent);
	pw.println(prefix + "tickerText=" + notification.tickerText);
			pw.print(prefix + "tickerText=");
			if (!TextUtils.isEmpty(notification.tickerText)) {
			final String ticker = notification.tickerText.toString();
			if (redact) {
			// if the string is long enough, we allow ourselves a few bytes for debugging
			pw.print(ticker.length() > 16 ? ticker.substring(0,8) : "");
			pw.println("...");
			} else {
			pw.println(ticker);
			}
			} else {
			pw.println("null");
			}
	pw.println(prefix + "contentView=" + notification.contentView);		pw.println(prefix + "contentView=" + notification.contentView);
	pw.println(prefix + String.format("color=0x%08x", notification.color));		pw.println(prefix + String.format("color=0x%08x", notification.color));
	pw.println(prefix + "timeout=" + TimeUtils.formatForLogging(notification.getTimeout()));		pw.println(prefix + "timeout=" + TimeUtils.formatForLogging(notification.getTimeout()));