From 1c264ea8d59d93865814a00d1f39f0a6b4947825 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Wed, 17 Jun 2020 16:52:57 -0700
Subject: [PATCH] Fix the dot state for persisted bubbles & clean up labels

Test: manual & treehugger - have some persistable bubbles, reboot device,
      get a new bubble, observe that persisted bubbles don't have a dot
      on them
Bug: 159260200
Change-Id: I71b07062e8221dcee2e8cc1eeed0963d38205c8e
---
 .../com/android/systemui/bubbles/Bubble.java    |  1 +
 .../bubbles/BubbleOverflowActivity.java         | 17 ++++-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java
index 6377b4f0a9c5b..075d3e7df4235 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java
@@ -144,6 +144,7 @@ class Bubble implements BubbleViewProvider {
         mDesiredHeight = desiredHeight;
         mDesiredHeightResId = desiredHeightResId;
         mTitle = title;
+        mShowBubbleUpdateDot = false;
     }
 
     /** Used in tests when no UI is required. */
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java
index b9437078a330c..7408fb3de0195 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java
@@ -22,7 +22,6 @@ import static com.android.systemui.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.pm.ShortcutInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -289,18 +288,10 @@ class BubbleOverflowAdapter extends RecyclerView.Adapter<BubbleOverflowAdapter.V
                     }
                 });
 
-        // If the bubble was persisted, the entry is null but it should have shortcut info
-        ShortcutInfo info = b.getShortcutInfo();
-        if (info == null) {
-            Log.d(TAG, "ShortcutInfo required to bubble but none found for " + b);
-        } else {
-            CharSequence label = info.getLabel();
-            if (label == null) {
-                vh.textView.setText(b.getAppName());
-            } else {
-                vh.textView.setText(label.toString());
-            }
-        }
+        CharSequence label = b.getShortcutInfo() != null
+                ? b.getShortcutInfo().getLabel()
+                : b.getAppName();
+        vh.textView.setText(label);
     }
 
     @Override