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

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

Merge "Rewrite dumping NSSL hierarchy" into sc-v2-dev am: 2bb5aa55 am: dddddb6e 

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

Change-Id: I1618193cc5187987a09e420ebfd576cf357ea107
parents 18bcde89 dddddb6e

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+40 −34
Original line number Original line Diff line number Diff line
@@ -107,6 +107,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; 
import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.policy.HeadsUpManager;

import com.android.systemui.statusbar.policy.HeadsUpManager;

import com.android.systemui.statusbar.policy.InflatedSmartReplyState;

import com.android.systemui.statusbar.policy.InflatedSmartReplyState;

import com.android.systemui.util.DumpUtilsKt;

import com.android.systemui.wmshell.BubblesManager;

import com.android.systemui.wmshell.BubblesManager;





import java.io.FileDescriptor;

import java.io.FileDescriptor;
@@ -3305,40 +3306,45 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 




    @Override

    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        super.dump(fd, pw, args);

        // Skip super call; dump viewState ourselves

        pw.println("Notification: " + mEntry.getKey());

        pw.println("Notification: " + mEntry.getKey());

        pw.print("    visibility: " + getVisibility());

        DumpUtilsKt.withIndenting(pw, ipw -> {

        pw.print(", alpha: " + getAlpha());

            ipw.print("visibility: " + getVisibility());

        pw.print(", translation: " + getTranslation());

            ipw.print(", alpha: " + getAlpha());

        pw.print(", removed: " + isRemoved());

            ipw.print(", translation: " + getTranslation());

        pw.print(", expandAnimationRunning: " + mExpandAnimationRunning);

            ipw.print(", removed: " + isRemoved());

            ipw.print(", expandAnimationRunning: " + mExpandAnimationRunning);

            NotificationContentView showingLayout = getShowingLayout();

            NotificationContentView showingLayout = getShowingLayout();

        pw.print(", privateShowing: " + (showingLayout == mPrivateLayout));

            ipw.print(", privateShowing: " + (showingLayout == mPrivateLayout));

        pw.println();

            ipw.println();

        showingLayout.dump(fd, pw, args);

            showingLayout.dump(fd, ipw, args);

        pw.print("    ");



            if (getViewState() != null) {

            if (getViewState() != null) {

            getViewState().dump(fd, pw, args);

                getViewState().dump(fd, ipw, args);

                ipw.println();

            } else {

            } else {

            pw.print("no viewState!!!");

                ipw.println("no viewState!!!");

            }

            }

        pw.println();



        pw.println();

            if (mIsSummaryWithChildren) {

            if (mIsSummaryWithChildren) {

            pw.print("  ChildrenContainer");

                ipw.println();

            pw.print(" visibility: " + mChildrenContainer.getVisibility());

                ipw.print("ChildrenContainer");

            pw.print(", alpha: " + mChildrenContainer.getAlpha());

                ipw.print(" visibility: " + mChildrenContainer.getVisibility());

            pw.print(", translationY: " + mChildrenContainer.getTranslationY());

                ipw.print(", alpha: " + mChildrenContainer.getAlpha());

            pw.println();

                ipw.print(", translationY: " + mChildrenContainer.getTranslationY());

                ipw.println();

                List<ExpandableNotificationRow> notificationChildren = getAttachedChildren();

                List<ExpandableNotificationRow> notificationChildren = getAttachedChildren();

            pw.println("  Children: " + notificationChildren.size());

                ipw.println("Children: " + notificationChildren.size());

            pw.println("  {");

                ipw.print("{");

                ipw.increaseIndent();

                for (ExpandableNotificationRow child : notificationChildren) {

                for (ExpandableNotificationRow child : notificationChildren) {

                child.dump(fd, pw, args);

                    ipw.println();

                    child.dump(fd, ipw, args);

                }

                }

            pw.println("  }");

                ipw.decreaseIndent();

            pw.println();

                ipw.println("}");

            }

            }

        });

    }

    }





    /**

    /**

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.animation.Interpolators; 
import com.android.systemui.statusbar.StatusBarIconView;

import com.android.systemui.statusbar.StatusBarIconView;

import com.android.systemui.statusbar.notification.stack.ExpandableViewState;

import com.android.systemui.statusbar.notification.stack.ExpandableViewState;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.util.DumpUtilsKt;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -743,6 +744,16 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable { 




    @Override

    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println(getClass().getSimpleName());

        DumpUtilsKt.withIndenting(pw, ipw -> {

            ExpandableViewState viewState = getViewState();

            if (viewState == null) {

                ipw.println("no viewState!!!");

            } else {

                viewState.dump(fd, ipw, args);

                ipw.println();

            }

        });

    }

    }





    /**

    /**

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java

+17 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,10 @@ import android.view.View; 
import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.statusbar.notification.stack.ExpandableViewState;

import com.android.systemui.statusbar.notification.stack.ExpandableViewState;

import com.android.systemui.statusbar.notification.stack.ViewState;

import com.android.systemui.statusbar.notification.stack.ViewState;

import com.android.systemui.util.DumpUtilsKt;



import java.io.FileDescriptor;

import java.io.PrintWriter;





public class FooterView extends StackScrollerDecorView {

public class FooterView extends StackScrollerDecorView {

    private FooterViewButton mDismissButton;

    private FooterViewButton mDismissButton;
@@ -44,6 +48,19 @@ public class FooterView extends StackScrollerDecorView { 
        return findViewById(R.id.dismiss_text);

        return findViewById(R.id.dismiss_text);

    }

    }





    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        super.dump(fd, pw, args);

        DumpUtilsKt.withIndenting(pw, ipw -> {

            ipw.println("visibility: " + DumpUtilsKt.visibilityString(getVisibility()));

            ipw.println("manageButton showHistory: " + mShowHistory);

            ipw.println("manageButton visibility: "

                    + DumpUtilsKt.visibilityString(mDismissButton.getVisibility()));

            ipw.println("dismissButton visibility: "

                    + DumpUtilsKt.visibilityString(mDismissButton.getVisibility()));

        });

    }



    @Override

    @Override

    protected void onFinishInflate() {

    protected void onFinishInflate() {

        super.onFinishInflate();

        super.onFinishInflate();

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -1938,7 +1938,6 @@ public class NotificationContentView extends FrameLayout { 
    }

    }





    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.print("    ");

        pw.print("contentView visibility: " + getVisibility());

        pw.print("contentView visibility: " + getVisibility());

        pw.print(", alpha: " + getAlpha());

        pw.print(", alpha: " + getAlpha());

        pw.print(", clipBounds: " + getClipBounds());

        pw.print(", clipBounds: " + getClipBounds());

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+35 −46
Original line number Original line Diff line number Diff line
@@ -109,6 +109,7 @@ import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController 
import com.android.systemui.statusbar.policy.HeadsUpUtil;

import com.android.systemui.statusbar.policy.HeadsUpUtil;

import com.android.systemui.statusbar.policy.ScrollAdapter;

import com.android.systemui.statusbar.policy.ScrollAdapter;

import com.android.systemui.util.Assert;

import com.android.systemui.util.Assert;

import com.android.systemui.util.DumpUtilsKt;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -4898,41 +4899,28 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 




    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println(String.format("[%s: pulsing=%s visibility=%s"

        StringBuilder sb = new StringBuilder("[")

                        + " alpha=%f scrollY:%d maxTopPadding=%d showShelfOnly=%s"

                .append(this.getClass().getSimpleName()).append(":")

                        + " qsExpandFraction=%f"

                .append(" pulsing=").append(mPulsing ? "T" : "f")

                        + " hideAmount=%f]",

                .append(" visibility=").append(DumpUtilsKt.visibilityString(getVisibility()))

                this.getClass().getSimpleName(),

                .append(" alpha=").append(getAlpha())

                mPulsing ? "T" : "f",

                .append(" scrollY=").append(mAmbientState.getScrollY())

                getVisibility() == View.VISIBLE ? "visible"

                .append(" maxTopPadding=").append(mMaxTopPadding)

                        : getVisibility() == View.GONE ? "gone"

                .append(" showShelfOnly=").append(mShouldShowShelfOnly ? "T" : "f")

                                : "invisible",

                .append(" qsExpandFraction=").append(mQsExpansionFraction)

                getAlpha(),

                .append(" isCurrentUserSetup=").append(mIsCurrentUserSetup)

                mAmbientState.getScrollY(),

                .append(" hideAmount=").append(mAmbientState.getHideAmount())

                mMaxTopPadding,

                .append("]");

                mShouldShowShelfOnly ? "T" : "f",

        pw.println(sb.toString());

                mQsExpansionFraction,

        DumpUtilsKt.withIndenting(pw, ipw -> {

                mAmbientState.getHideAmount()));

            int childCount = getChildCount();

            int childCount = getChildCount();

        pw.println("  Number of children: " + childCount);

            ipw.println("Number of children: " + childCount);

        pw.println();

            ipw.println();





            for (int i = 0; i < childCount; i++) {

            for (int i = 0; i < childCount; i++) {

                ExpandableView child = (ExpandableView) getChildAt(i);

                ExpandableView child = (ExpandableView) getChildAt(i);

            child.dump(fd, pw, args);

                child.dump(fd, ipw, args);

            if (!(child instanceof ExpandableNotificationRow)) {

                ipw.println();

                pw.println("  " + child.getClass().getSimpleName());

                // Notifications dump it's viewstate as part of their dump to support children

                ExpandableViewState viewState = child.getViewState();

                if (viewState == null) {

                    pw.println("    no viewState!!!");

                } else {

                    pw.print("    ");

                    viewState.dump(fd, pw, args);

                    pw.println();

                    pw.println();

                }

            }

            }

            }

            int transientViewCount = getTransientViewCount();

            int transientViewCount = getTransientViewCount();

            pw.println("Transient Views: " + transientViewCount);

            pw.println("Transient Views: " + transientViewCount);
@@ -4946,6 +4934,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
                ExpandableView expandableView = (ExpandableView) swipedView;

                ExpandableView expandableView = (ExpandableView) swipedView;

                expandableView.dump(fd, pw, args);

                expandableView.dump(fd, pw, args);

            }

            }

        });

    }

    }





    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)