Merge "Dump ExpandableView clipping from ENR" into main
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index 2c6b09c..adb3352 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -3884,6 +3884,7 @@
}
showingLayout.dump(pw, args);
dumpCustomOutline(pw, args);
+ dumpClipping(pw, args);
if (getViewState() != null) {
getViewState().dump(pw, args);
pw.println();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java
index afda426..ef6cad1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java
@@ -856,17 +856,23 @@
pw.println();
}
if (DUMP_VERBOSE) {
- pw.println("mInRemovalAnimation: " + mInRemovalAnimation);
- pw.println("mClipTopAmount: " + mClipTopAmount);
- pw.println("mClipBottomAmount " + mClipBottomAmount);
- pw.println("mClipToActualHeight: " + mClipToActualHeight);
- pw.println("mExtraWidthForClipping: " + mExtraWidthForClipping);
- pw.println("mMinimumHeightForClipping: " + mMinimumHeightForClipping);
- pw.println("getClipBounds(): " + getClipBounds());
+ dumpClipping(pw, args);
}
});
}
+ protected void dumpClipping(IndentingPrintWriter pw, String[] args) {
+ pw.print("Clipping: ");
+ pw.print("mInRemovalAnimation", mInRemovalAnimation);
+ pw.print("mClipTopAmount", mClipTopAmount);
+ pw.print("mClipBottomAmount", mClipBottomAmount);
+ pw.print("mClipToActualHeight", mClipToActualHeight);
+ pw.print("mExtraWidthForClipping", mExtraWidthForClipping);
+ pw.print("mMinimumHeightForClipping", mMinimumHeightForClipping);
+ pw.print("getClipBounds()", getClipBounds());
+ pw.println();
+ }
+
/**
* return the amount that the content is translated
*/