Merge "Add y position to nssl debug lines" into tm-dev

This commit is contained in:
TreeHugger Robot
2022-03-15 01:56:41 +00:00
committed by Android (Google) Code Review

View File

@@ -758,29 +758,30 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
mDebugTextUsedYPositions.clear(); mDebugTextUsedYPositions.clear();
} }
int y = mTopPadding; int y = mTopPadding;
drawDebugInfo(canvas, y, Color.RED, /* label= */ "mTopPadding"); drawDebugInfo(canvas, y, Color.RED, /* label= */ "mTopPadding = "+y);
y = getLayoutHeight(); y = getLayoutHeight();
drawDebugInfo(canvas, y, Color.YELLOW, /* label= */ "getLayoutHeight()"); drawDebugInfo(canvas, y, Color.YELLOW, /* label= */ "getLayoutHeight() = "+y);
y = (int) mMaxLayoutHeight; y = (int) mMaxLayoutHeight;
drawDebugInfo(canvas, y, Color.MAGENTA, /* label= */ "mMaxLayoutHeight"); drawDebugInfo(canvas, y, Color.MAGENTA, /* label= */ "mMaxLayoutHeight = "+y);
if (mKeyguardBottomPadding >= 0) { if (mKeyguardBottomPadding >= 0) {
y = getHeight() - (int) mKeyguardBottomPadding; y = getHeight() - (int) mKeyguardBottomPadding;
drawDebugInfo(canvas, y, Color.GRAY, drawDebugInfo(canvas, y, Color.GRAY,
/* label= */ "getHeight() - mKeyguardBottomPadding"); /* label= */ "getHeight() - mKeyguardBottomPadding = "+y);
} }
y = getHeight() - getEmptyBottomMargin(); y = getHeight() - getEmptyBottomMargin();
drawDebugInfo(canvas, y, Color.GREEN, /* label= */ "getHeight() - getEmptyBottomMargin()"); drawDebugInfo(canvas, y, Color.GREEN,
/* label= */ "getHeight() - getEmptyBottomMargin() = "+y);
y = (int) (mAmbientState.getStackY()); 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()); y = (int) (mAmbientState.getStackY() + mAmbientState.getStackHeight());
drawDebugInfo(canvas, y, Color.BLUE, 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) { private void drawDebugInfo(Canvas canvas, int y, int color, String label) {