Merge "Refactoring of UiAutomator to use the new UI test APIs."
diff --git a/uiautomator/api/current.txt b/uiautomator/api/current.txt
index cf78296..a8f287b 100644
--- a/uiautomator/api/current.txt
+++ b/uiautomator/api/current.txt
@@ -17,6 +17,7 @@
method public java.lang.String getCurrentPackageName();
method public int getDisplayHeight();
method public int getDisplayRotation();
+ method public android.graphics.Point getDisplaySizeDp();
method public int getDisplayWidth();
method public static com.android.uiautomator.core.UiDevice getInstance();
method public java.lang.String getLastTraversedText();
diff --git a/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java b/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
index 3605e40..b468574 100644
--- a/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
+++ b/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
@@ -119,18 +119,18 @@
/**
* Returns the display size in dp (device-independent pixel)
*
- * The returned display size is adjusted per screen rotation
+ * The returned display size is adjusted per screen rotation. Also this will return the actual
+ * size of the screen, rather than adjusted per system decorations (like status bar).
*
* @return a Point containing the display size in dp
- * @hide
*/
public Point getDisplaySizeDp() {
Tracer.trace();
Display display = getDefaultDisplay();
Point p = new Point();
- display.getSize(p);
+ display.getRealSize(p);
DisplayMetrics metrics = new DisplayMetrics();
- display.getMetrics(metrics);
+ display.getRealMetrics(metrics);
float dpx = p.x / metrics.density;
float dpy = p.y / metrics.density;
p.x = Math.round(dpx);
