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

Merge "Improve readability of the insets related dump"

Browse Source
This commit is contained in:
Yunfan Chen
2022-12-22 04:47:02 +00:00
committed by Android (Google) Code Review
parent eabfee06a8 054dd0836e
commit 746366d041
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/InsetsFrameProvider.java
View File

@@ -323,7 +323,8 @@ public class InsetsFrameProvider implements Parcelable {
public String toString() {
StringBuilder sb = new StringBuilder(32);
sb.append("TypedInsetsSize: {");
sb.append("windowType=").append(windowType);
sb.append("windowType=").append(ViewDebug.intToString(
WindowManager.LayoutParams.class, "type", windowType));
sb.append(", insetsSize=").append(insetsSize);
sb.append("}");
return sb.toString();

14
core/java/android/view/WindowManager.java
View File

@@ -4759,10 +4759,10 @@ public interface WindowManager extends ViewManager {
}
if (providedInsets != null) {
sb.append(System.lineSeparator());
sb.append(" providedInsets=");
sb.append(prefix).append(" providedInsets:");
for (int i = 0; i < providedInsets.length; ++i) {
if (i > 0) sb.append(' ');
sb.append((providedInsets[i]));
sb.append(System.lineSeparator());
sb.append(prefix).append(" ").append(providedInsets[i]);
}
}
if (insetsRoundedCornerFrame) {
@@ -4771,10 +4771,12 @@ public interface WindowManager extends ViewManager {
}
if (paramsForRotation != null && paramsForRotation.length != 0) {
sb.append(System.lineSeparator());
sb.append(prefix).append(" paramsForRotation=");
sb.append(prefix).append(" paramsForRotation:");
for (int i = 0; i < paramsForRotation.length; ++i) {
if (i > 0) sb.append(' ');
sb.append(paramsForRotation[i].toString());
// Additional prefix needed for the beginning of the params of the new rotation.
sb.append(System.lineSeparator()).append(prefix).append(" ");
sb.append(Surface.rotationToString(i)).append("=");
sb.append(paramsForRotation[i].toString(prefix + " "));
}
}

6
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -6738,12 +6738,12 @@ public class WindowManagerService extends IWindowManager.Stub
pw.print(" mDisplayFrozen="); pw.print(mDisplayFrozen);
pw.print(" windows="); pw.print(mWindowsFreezingScreen);
pw.print(" client="); pw.print(mClientFreezingScreen);
pw.print(" apps="); pw.print(mAppsFreezingScreen);
pw.print(" apps="); pw.println(mAppsFreezingScreen);
final DisplayContent defaultDisplayContent = getDefaultDisplayContentLocked();
pw.print(" mRotation="); pw.print(defaultDisplayContent.getRotation());
pw.print(" mRotation="); pw.println(defaultDisplayContent.getRotation());
pw.print(" mLastOrientation=");
pw.println(defaultDisplayContent.getLastOrientation());
pw.print(" waitingForConfig=");
pw.print(" mWaitingForConfig=");
pw.println(defaultDisplayContent.mWaitingForConfig);
pw.print(" Animation settings: disabled="); pw.print(mAnimationsDisabled);