diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java index bea4ba776beb..8fd20517782f 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java @@ -22,6 +22,7 @@ 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; @@ -204,6 +205,8 @@ public class BubbleOverflowActivity extends Activity { } class BubbleOverflowAdapter extends RecyclerView.Adapter<BubbleOverflowAdapter.ViewHolder> { + private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleOverflowAdapter" : TAG_BUBBLES; + private Context mContext; private Consumer<Bubble> mPromoteBubbleFromOverflow; private List<Bubble> mBubbles; @@ -282,11 +285,16 @@ class BubbleOverflowAdapter extends RecyclerView.Adapter<BubbleOverflowAdapter.V } }); - Bubble.FlyoutMessage message = b.getFlyoutMessage(); - if (message != null && message.senderName != null) { - vh.textView.setText(message.senderName.toString()); + ShortcutInfo info = b.getEntry().getRanking().getShortcutInfo(); + if (info == null) { + Log.d(TAG, "ShortcutInfo required to bubble but none found for " + b); } else { - vh.textView.setText(b.getAppName()); + CharSequence label = info.getLabel(); + if (label == null) { + vh.textView.setText(b.getAppName()); + } else { + vh.textView.setText(label.toString()); + } } } |