Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: I0c2142da15c68090a5bb5bea66636991daa1ef8e

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. */

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