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

Commit bf965f11 authored by Mady Mellor's avatar Mady Mellor
Browse files

Make logs.i so they show up in userdebug 

Also updates the doRemove log.d to show up for app bubbles too.

Test: lunch tangorpro-trunk_staging-userdebug; make; add and remove
      app bubble & observe logs
Bug: 314124017
Change-Id: I14d7b16fe0432f080dc74d41ea08f50d317350fb
parent 4881667c

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class Bubble implements BubbleViewProvider { 
    private static final String TAG = "Bubble";



    /** A string suffix used in app bubbles' {@link #mKey}. */

    private static final String KEY_APP_BUBBLE = "key_app_bubble";

    public static final String KEY_APP_BUBBLE = "key_app_bubble";



    /** Whether the bubble is an app bubble. */

    private final boolean mIsAppBubble;

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+5 −5
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        }



        String appBubbleKey = Bubble.getAppBubbleKeyForApp(intent.getPackage(), user);

        Log.v(TAG, "showOrHideAppBubble, with key: " + appBubbleKey);

        Log.i(TAG, "showOrHideAppBubble, with key: " + appBubbleKey);

        PackageManager packageManager = getPackageManagerForUser(mContext, user.getIdentifier());

        if (!isResizableActivity(intent, packageManager, appBubbleKey)) return;
@@ -1259,22 +1259,22 @@ public class BubbleController implements ConfigurationChangeListener, 
            if (isStackExpanded()) {

                if (selectedBubble != null && appBubbleKey.equals(selectedBubble.getKey())) {

                    // App bubble is expanded, lets collapse

                    Log.v(TAG, "  showOrHideAppBubble, selected bubble is app bubble, collapsing");

                    Log.i(TAG, "  showOrHideAppBubble, selected bubble is app bubble, collapsing");

                    collapseStack();

                } else {

                    // App bubble is not selected, select it

                    Log.v(TAG, "  showOrHideAppBubble, expanded, selecting existing app bubble");

                    Log.i(TAG, "  showOrHideAppBubble, expanded, selecting existing app bubble");

                    mBubbleData.setSelectedBubble(existingAppBubble);

                }

            } else {

                // App bubble is not selected, select it & expand

                Log.v(TAG, "  showOrHideAppBubble, expand and select existing app bubble");

                Log.i(TAG, "  showOrHideAppBubble, expand and select existing app bubble");

                mBubbleData.setSelectedBubble(existingAppBubble);

                mBubbleData.setExpanded(true);

            }

        } else {

            // App bubble does not exist, lets add and expand it

            Log.v(TAG, "  showOrHideAppBubble, creating and expanding app bubble");

            Log.i(TAG, "  showOrHideAppBubble, creating and expanding app bubble");

            Bubble b = Bubble.createAppBubble(intent, user, icon, mMainExecutor);

            b.setShouldAutoExpand(true);

            inflateAndAdd(b, /* suppressFlyout= */ true, /* showInShade= */ false);

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.wm.shell.bubbles; 


import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;

import static com.android.internal.annotations.VisibleForTesting.Visibility.PRIVATE;

import static com.android.wm.shell.bubbles.Bubble.KEY_APP_BUBBLE;

import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_DATA;

import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES;

import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME;
@@ -649,8 +650,8 @@ public class BubbleData { 
    }



    private void doRemove(String key, @DismissReason int reason) {

        if (DEBUG_BUBBLE_DATA) {

            Log.d(TAG, "doRemove: " + key);

        if (DEBUG_BUBBLE_DATA || (key != null && key.contains(KEY_APP_BUBBLE))) {

            Log.d(TAG, "doRemove: " + key + " reason: " + reason);

        }

        //  If it was pending remove it

        if (mPendingBubbles.containsKey(key)) {