Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19125ed5 authored by Rico Wind's avatar Rico Wind Committed by Android (Google) Code Review
Browse files

Revert "Improve readability of the insets related dump" 

This reverts commit 054dd083.

Reason for revert: b/263470909

Change-Id: Ifd984211b192a5ed96156584f0745b440442c0fe
parent 054dd083

core/java/android/view/InsetsFrameProvider.java

+1 −2
Original line number Diff line number Diff line
@@ -323,8 +323,7 @@ public class InsetsFrameProvider implements Parcelable { 
        public String toString() {

            StringBuilder sb = new StringBuilder(32);

            sb.append("TypedInsetsSize: {");

            sb.append("windowType=").append(ViewDebug.intToString(

                    WindowManager.LayoutParams.class, "type", windowType));

            sb.append("windowType=").append(windowType);

            sb.append(", insetsSize=").append(insetsSize);

            sb.append("}");

            return sb.toString();

core/java/android/view/WindowManager.java

+6 −8
Original line number Diff line number Diff line
@@ -4737,10 +4737,10 @@ public interface WindowManager extends ViewManager { 
            }

            if (providedInsets != null) {

                sb.append(System.lineSeparator());

                sb.append(prefix).append("  providedInsets:");

                sb.append(" providedInsets=");

                for (int i = 0; i < providedInsets.length; ++i) {

                    sb.append(System.lineSeparator());

                    sb.append(prefix).append("    ").append(providedInsets[i]);

                    if (i > 0) sb.append(' ');

                    sb.append((providedInsets[i]));

                }

            }

            if (insetsRoundedCornerFrame) {
@@ -4749,12 +4749,10 @@ 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) {

                    // 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 + "    "));

                    if (i > 0) sb.append(' ');

                    sb.append(paramsForRotation[i].toString());

                }

            }

services/core/java/com/android/server/wm/WindowManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -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.println(mAppsFreezingScreen);

                    pw.print(" apps="); pw.print(mAppsFreezingScreen);

            final DisplayContent defaultDisplayContent = getDefaultDisplayContentLocked();

            pw.print("  mRotation="); pw.println(defaultDisplayContent.getRotation());

            pw.print("  mRotation="); pw.print(defaultDisplayContent.getRotation());

            pw.print("  mLastOrientation=");

                    pw.println(defaultDisplayContent.getLastOrientation());

            pw.print("  mWaitingForConfig=");

            pw.print(" waitingForConfig=");

                    pw.println(defaultDisplayContent.mWaitingForConfig);



            pw.print("  Animation settings: disabled="); pw.print(mAnimationsDisabled);