Rely on Display#getRealSize when dumping XML hierarchy
* Previously, the height returned by Display#getSize was used to
determine visible objects. Based on the API level and the presence of system decorations (e.g. notches), this can cause objects near the
bottom of the screen to be considered out of bounds (i.e. only objects
within y=0 and y=partial_height are considered even if the omitted
decorations are at the top of the screen). cherry pick from aosp/2384832
Bug: 236669488
Test: manual
Merged-In: Iba21245c947cec0d0054f6d86e3585ba73233223
Change-Id: I50f143528d1f5a5b677eb2628efbcd658f4cc1b0
(cherry picked from commit afebeb7b43)
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user