Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaca11c5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ie0b2328dfc25a10b09edcec19f4fcc885e7addca
parents 4dcd6ee8 f8b08dfa

packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java

+1 −0
Original line number Diff line number Diff line
@@ -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

+4 −13
Original line number Diff line number Diff line
@@ -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