Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update RoundableState logs" into udc-dev

Browse Source
This commit is contained in:
András Kurucz
2023-04-20 15:27:16 +00:00
committed by Android (Google) Code Review
parent b4278fb584 af47fa7371
commit a02e5f131b
4 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/notification/Roundable.kt
View File

@@ -383,11 +383,11 @@ class RoundableState(
}
fun debugString() = buildString {
append("TargetView: ${targetView.hashCode()} ")
append("Top: $topRoundness ")
append(topRoundnessMap.map { "${it.key} ${it.value}" })
append(" Bottom: $bottomRoundness ")
append(bottomRoundnessMap.map { "${it.key} ${it.value}" })
append("Roundable { ")
append("top: { value: $topRoundness, requests: $topRoundnessMap}")
append(", ")
append("bottom: { value: $bottomRoundness, requests: $bottomRoundnessMap}")
append("}")
}
companion object {

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

@@ -3649,16 +3649,12 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
} else {
pw.println("no viewState!!!");
}
pw.println("Roundness: " + getRoundableState().debugString());
pw.println(getRoundableState().debugString());
int transientViewCount = mChildrenContainer == null
? 0 : mChildrenContainer.getTransientViewCount();
if (mIsSummaryWithChildren || transientViewCount > 0) {
pw.println();
pw.print("ChildrenContainer");
pw.print(" visibility: " + mChildrenContainer.getVisibility());
pw.print(", alpha: " + mChildrenContainer.getAlpha());
pw.print(", translationY: " + mChildrenContainer.getTranslationY());
pw.println(mChildrenContainer.debugString());
pw.println();
List<ExpandableNotificationRow> notificationChildren = getAttachedChildren();
pw.print("Children: " + notificationChildren.size() + " {");
@@ -3725,12 +3721,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
}
}
@Override
public String toString() {
String roundableStateDebug = "RoundableState = " + getRoundableState().debugString();
return "ExpandableNotificationRow:" + hashCode() + " { " + roundableStateDebug + " }";
}
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableOutlineView.java
View File

@@ -352,7 +352,7 @@ public abstract class ExpandableOutlineView extends ExpandableView {
IndentingPrintWriter pw = DumpUtilsKt.asIndenting(pwOriginal);
super.dump(pw, args);
DumpUtilsKt.withIncreasedIndent(pw, () -> {
pw.println("Roundness: " + getRoundableState().debugString());
pw.println(getRoundableState().debugString());
if (DUMP_VERBOSE) {
pw.println("mCustomOutline: " + mCustomOutline + " mOutlineRect: " + mOutlineRect);
pw.println("mOutlineAlpha: " + mOutlineAlpha);

10
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
View File

@@ -1546,9 +1546,11 @@ public class NotificationChildrenContainer extends ViewGroup
mUseRoundnessSourceTypes = enabled;
}
@Override
public String toString() {
String roundableStateDebug = "RoundableState = " + getRoundableState().debugString();
return "NotificationChildrenContainer:" + hashCode() + " { " + roundableStateDebug + " }";
public String debugString() {
return TAG + " { "
+ "visibility: " + getVisibility()
+ ", alpha: " + getAlpha()
+ ", translationY: " + getTranslationY()
+ ", roundableState: " + getRoundableState().debugString() + "}";
}
}