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

Commit 8bfcea1a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add bubble logging for permission dialog shown."

parents f9aa3044 a62cb6a3

cmds/statsd/src/atoms.proto

+1 −1
Original line number Diff line number Diff line
@@ -5455,7 +5455,7 @@ message BubbleUIChanged { 
        HEADER_GO_TO_SETTINGS = 9;

        PERMISSION_OPT_IN = 10;

        PERMISSION_OPT_OUT = 11;

        PERMISSION_IGNORED = 12;

        PERMISSION_DIALOG_SHOWN = 12;

        SWIPE_LEFT = 13;

        SWIPE_RIGHT = 14;

        STACK_EXPANDED = 15;

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

+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
            mPermissionView.setVisibility(VISIBLE);

            ((ImageView) mPermissionView.findViewById(R.id.pkgicon)).setImageDrawable(mAppIcon);

            ((TextView) mPermissionView.findViewById(R.id.pkgname)).setText(mAppName);

            logBubbleClickEvent(mEntry.notification,

                    StatsLog.BUBBLE_UICHANGED__ACTION__PERMISSION_DIALOG_SHOWN);

        }

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -786,7 +786,10 @@ public class BubbleStackView extends FrameLayout { 
     * @return the index of the bubble view within the bubble stack. The range of the position

     * is between 0 and the bubble count minus 1.

     */

    int getBubbleIndex(Bubble bubble) {

    int getBubbleIndex(@Nullable Bubble bubble) {

        if (bubble == null) {

            return 0;

        }

        return mBubbleContainer.indexOfChild(bubble.iconView);

    }