Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: I159e8a7c412967b5ac9c063ecd01d4554ec90d4f

src/com/android/settings/notification/history/NotificationStation.java

@@ -458,6 +458,18 @@ public class NotificationStation extends SettingsPreferenceFragment {
                     .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 @@ public class NotificationStation extends SettingsPreferenceFragment {
                     .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) {