Merge "Import translations. DO NOT MERGE" into rvc-dev
diff --git a/src/com/android/settings/notification/history/NotificationStation.java b/src/com/android/settings/notification/history/NotificationStation.java
index 3215442..9d53479 100644
--- a/src/com/android/settings/notification/history/NotificationStation.java
+++ b/src/com/android/settings/notification/history/NotificationStation.java
@@ -458,6 +458,18 @@
.append(bold(getString(R.string.notification_log_channel)))
.append(delim)
.append(info.channel.toString());
+ sb.append("\n")
+ .append(bold("getShortcutInfo"))
+ .append(delim)
+ .append(String.valueOf(rank.getShortcutInfo()));
+ sb.append("\n")
+ .append(bold("isConversation"))
+ .append(delim)
+ .append(rank.isConversation() ? "true" : "false");
+ sb.append("\n")
+ .append(bold("isBubble"))
+ .append(delim)
+ .append(rank.isBubble() ? "true" : "false");
if (info.active) {
sb.append("\n")
.append(bold(getString(
@@ -593,6 +605,18 @@
.append(delim)
.append(n.contentView.toString());
}
+ if (n.getBubbleMetadata() != null) {
+ sb.append("\n")
+ .append(bold("bubbleMetadata"))
+ .append(delim)
+ .append(String.valueOf(n.getBubbleMetadata()));
+ }
+ if (n.getShortcutId() != null) {
+ sb.append("\n")
+ .append(bold("shortcutId"))
+ .append(delim)
+ .append(String.valueOf(n.getShortcutId()));
+ }
if (DUMP_EXTRAS) {
if (n.extras != null && n.extras.size() > 0) {