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

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

Merge "Expand dumpsys coverage to all known factors in empty expanded view... 

Merge "Expand dumpsys coverage to all known factors in empty expanded view issues." into rvc-dev am: d65287ec am: 7c8b2427 am: 2d79d7f2

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

Change-Id: I7c03014ebc3558efb7de8e2e924ab587297c6ef5
parents 965b3da8 2d79d7f2

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

+8 −0
Original line number Diff line number Diff line
@@ -506,6 +506,14 @@ public class BubbleExpandedView extends LinearLayout { 
        }

    }



    @Nullable ActivityView getActivityView() {

        return mActivityView;

    }



    int getTaskId() {

        return mTaskId;

    }



    /**

     * Called by {@link BubbleStackView} when the insets for the expanded state should be updated.

     * This should be done post-move and post-animation.

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

+35 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.ValueAnimator;

import android.annotation.SuppressLint;

import android.app.ActivityView;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;
@@ -296,8 +297,39 @@ public class BubbleStackView extends FrameLayout 
        pw.print("  gestureInProgress:       "); pw.println(mIsGestureInProgress);

        pw.print("  showingDismiss:          "); pw.println(mShowingDismiss);

        pw.print("  isExpansionAnimating:    "); pw.println(mIsExpansionAnimating);

        pw.print("  expandedContainerVis:    "); pw.println(mExpandedViewContainer.getVisibility());

        pw.print("  expandedContainerAlpha:  "); pw.println(mExpandedViewContainer.getAlpha());

        pw.print("  expandedContainerMatrix: ");

        pw.println(mExpandedViewContainer.getAnimationMatrix());



        mStackAnimationController.dump(fd, pw, args);

        mExpandedAnimationController.dump(fd, pw, args);



        if (mExpandedBubble != null) {

            pw.println("Expanded bubble state:");

            pw.println("  expandedBubbleKey: " + mExpandedBubble.getKey());



            final BubbleExpandedView expandedView = mExpandedBubble.getExpandedView();



            if (expandedView != null) {

                pw.println("  expandedViewVis:    " + expandedView.getVisibility());

                pw.println("  expandedViewAlpha:  " + expandedView.getAlpha());

                pw.println("  expandedViewTaskId: " + expandedView.getTaskId());



                final ActivityView av = expandedView.getActivityView();



                if (av != null) {

                    pw.println("  activityViewVis:    " + av.getVisibility());

                    pw.println("  activityViewAlpha:  " + av.getAlpha());

                } else {

                    pw.println("  activityView is null");

                }

            } else {

                pw.println("Expanded bubble view state: expanded bubble view is null");

            }

        } else {

            pw.println("Expanded bubble state: expanded bubble is null");

        }

    }



    private BubbleController.BubbleExpandListener mExpandListener;