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

Commit a9d6585f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Improve readability of the insets related dump"""

parents 58e08406 48d3ea38

core/java/android/view/InsetsFrameProvider.java

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

        public String toString() {

            StringBuilder sb = new StringBuilder(32);

            StringBuilder sb = new StringBuilder(32);

            sb.append("TypedInsetsSize: {");

            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(", insetsSize=").append(insetsSize);

            sb.append("}");

            sb.append("}");

            return sb.toString();

            return sb.toString();

core/java/android/view/WindowManager.java

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

            }

            if (providedInsets != null) {

            if (providedInsets != null) {

                sb.append(System.lineSeparator());

                sb.append(System.lineSeparator());

                sb.append(" providedInsets=");

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

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

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

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

                    sb.append(System.lineSeparator());

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

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

                }

                }

            }

            }

            if (insetsRoundedCornerFrame) {

            if (insetsRoundedCornerFrame) {
@@ -4810,10 +4810,12 @@ public interface WindowManager extends ViewManager { 
            }

            }

            if (paramsForRotation != null && paramsForRotation.length != 0) {

            if (paramsForRotation != null && paramsForRotation.length != 0) {

                sb.append(System.lineSeparator());

                sb.append(System.lineSeparator());

                sb.append(prefix).append("  paramsForRotation=");

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

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

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

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

                    // Additional prefix needed for the beginning of the params of the new rotation.

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

                    sb.append(System.lineSeparator()).append(prefix).append("    ");

                    sb.append(Surface.rotationToString(i)).append("=");

                    sb.append(paramsForRotation[i].toString(prefix + "    "));

                }

                }

            }

            }

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -6725,12 +6725,12 @@ public class WindowManagerService extends IWindowManager.Stub 
            pw.print("  mDisplayFrozen="); pw.print(mDisplayFrozen);

            pw.print("  mDisplayFrozen="); pw.print(mDisplayFrozen);

                    pw.print(" windows="); pw.print(mWindowsFreezingScreen);

                    pw.print(" windows="); pw.print(mWindowsFreezingScreen);

                    pw.print(" client="); pw.print(mClientFreezingScreen);

                    pw.print(" client="); pw.print(mClientFreezingScreen);

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

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

            final DisplayContent defaultDisplayContent = getDefaultDisplayContentLocked();

            final DisplayContent defaultDisplayContent = getDefaultDisplayContentLocked();

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

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

            pw.print("  mLastOrientation=");

            pw.print("  mLastOrientation=");

                    pw.println(defaultDisplayContent.getLastOrientation());

                    pw.println(defaultDisplayContent.getLastOrientation());

            pw.print(" waitingForConfig=");

            pw.print("  mWaitingForConfig=");

                    pw.println(defaultDisplayContent.mWaitingForConfig);

                    pw.println(defaultDisplayContent.mWaitingForConfig);





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

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