diff options
| -rw-r--r-- | core/java/android/view/InsetsFrameProvider.java | 3 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 14 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 6 |
3 files changed, 13 insertions, 10 deletions
diff --git a/core/java/android/view/InsetsFrameProvider.java b/core/java/android/view/InsetsFrameProvider.java index 58ee59d1b36b..0a2b06ca7e70 100644 --- a/core/java/android/view/InsetsFrameProvider.java +++ b/core/java/android/view/InsetsFrameProvider.java @@ -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(); diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 67a6e89cfdd9..945b56b17d93 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -4737,10 +4737,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) { @@ -4749,10 +4749,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 + " ")); } } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 23bce36fc5d4..cc0dd58365d6 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -6700,12 +6700,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); |