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

Commit 1dd6c00c authored by Daniel Peykov's avatar Daniel Peykov Committed by Automerger Merge Worker
Browse files

Merge "Rely on Display#getRealSize when dumping XML hierarchy" am: 228fabcb... 

Merge "Rely on Display#getRealSize when dumping XML hierarchy" am: 228fabcb am: ef212f4b am: 795df482

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2281620



Change-Id: Id72163f1c7b821c9e4fbb045962bb9736e94ef88
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 486fbb06 795df482

cmds/uiautomator/cmds/uiautomator/src/com/android/commands/uiautomator/DumpCommand.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public class DumpCommand extends Command { 
                        DisplayManagerGlobal.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);

                int rotation = display.getRotation();

                Point size = new Point();

                display.getSize(size);

                display.getRealSize(size);

                AccessibilityNodeInfoDumper.dumpWindowToFile(info, dumpFile, rotation, size.x,

                        size.y);

            }

cmds/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public class AccessibilityNodeInfoDumper { 
                serializer.attribute("", "id", Integer.toString(displayId));

                int rotation = display.getRotation();

                Point size = new Point();

                display.getSize(size);

                display.getRealSize(size);

                for (int i = 0, n = windows.size(); i < n; ++i) {

                    dumpWindowRec(windows.get(i), serializer, i, size.x, size.y, rotation);

                }

cmds/uiautomator/library/core-src/com/android/uiautomator/core/UiDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ public class UiDevice { 
        if(root != null) {

            Display display = getAutomatorBridge().getDefaultDisplay();

            Point size = new Point();

            display.getSize(size);

            display.getRealSize(size);

            AccessibilityNodeInfoDumper.dumpWindowToFile(root,

                    new File(new File(Environment.getDataDirectory(), "local/tmp"), fileName),

                    display.getRotation(), size.x, size.y);