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

Commit 240d62f7 authored Feb 28, 2023 by Manjeet Rulhania Committed by Automerger Merge Worker Feb 28, 2023

Rely on Display#getRealSize when dumping XML hierarchy am: 74184991 am: 90075dd1

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

Change-Id: I06752d3d5c2fe76d5e0864c811762d70e6696ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d632a397 90075dd1

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);