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

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

Merge "Add y position to nssl debug lines" into tm-dev am: 4a503f38 

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

Change-Id: Ia19eb871d95ac84a85b20c06650170e00f92406f
parents f2d66cfc 4a503f38

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

+8 −7
Original line number Diff line number Diff line
@@ -758,29 +758,30 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            mDebugTextUsedYPositions.clear();

        }

        int y = mTopPadding;

        drawDebugInfo(canvas, y, Color.RED, /* label= */ "mTopPadding");

        drawDebugInfo(canvas, y, Color.RED, /* label= */ "mTopPadding = "+y);



        y = getLayoutHeight();

        drawDebugInfo(canvas, y, Color.YELLOW, /* label= */ "getLayoutHeight()");

        drawDebugInfo(canvas, y, Color.YELLOW, /* label= */ "getLayoutHeight() = "+y);



        y = (int) mMaxLayoutHeight;

        drawDebugInfo(canvas, y, Color.MAGENTA, /* label= */ "mMaxLayoutHeight");

        drawDebugInfo(canvas, y, Color.MAGENTA, /* label= */ "mMaxLayoutHeight = "+y);



        if (mKeyguardBottomPadding >= 0) {

            y = getHeight() - (int) mKeyguardBottomPadding;

            drawDebugInfo(canvas, y, Color.GRAY,

                    /* label= */ "getHeight() - mKeyguardBottomPadding");

                    /* label= */ "getHeight() - mKeyguardBottomPadding = "+y);

        }



        y = getHeight() - getEmptyBottomMargin();

        drawDebugInfo(canvas, y, Color.GREEN, /* label= */ "getHeight() - getEmptyBottomMargin()");

        drawDebugInfo(canvas, y, Color.GREEN,

                /* label= */ "getHeight() - getEmptyBottomMargin() = "+y);



        y = (int) (mAmbientState.getStackY());

        drawDebugInfo(canvas, y, Color.CYAN, /* label= */ "mAmbientState.getStackY()");

        drawDebugInfo(canvas, y, Color.CYAN, /* label= */ "mAmbientState.getStackY() = "+y);



        y = (int) (mAmbientState.getStackY() + mAmbientState.getStackHeight());

        drawDebugInfo(canvas, y, Color.BLUE,

                /* label= */ "mAmbientState.getStackY() + mAmbientState.getStackHeight()");

                /* label= */ "mAmbientState.getStackY() + mAmbientState.getStackHeight() = "+y);

    }



    private void drawDebugInfo(Canvas canvas, int y, int color, String label) {