| commit | 021273a58cb7ca357ef143e89a7ab916d7ae3e99 | [log] [tgz] |
|---|---|---|
| author | Madan Ankapura <mankapura@google.com> | Thu May 16 18:48:31 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 16 18:48:31 2013 +0000 |
| tree | b9625f17dbc6b62cad8aa6aae08baae8b5a362b3 | |
| parent | 8e4d2d0317d0ddf376e010b1eb975bb9d3868317 [diff] | |
| parent | 56c756f3ee617549a692b99ee47d4c9c3473ba30 [diff] |
Merge "Use real sizes for display metrics" into jb-mr2-dev
diff --git a/tools/device-setup/TestDeviceSetup/Android.mk b/tools/device-setup/TestDeviceSetup/Android.mk index f6c1079..efa50bf 100644 --- a/tools/device-setup/TestDeviceSetup/Android.mk +++ b/tools/device-setup/TestDeviceSetup/Android.mk
@@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_SDK_VERSION := 16 +LOCAL_SDK_VERSION := 17 LOCAL_PACKAGE_NAME := TestDeviceSetup
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java index 565ac7f..49e96a0 100644 --- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java +++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
@@ -77,7 +77,7 @@ WindowManager wm = (WindowManager) getContext().getSystemService( Context.WINDOW_SERVICE); Display d = wm.getDefaultDisplay(); - d.getMetrics(metrics); + d.getRealMetrics(metrics); addResult(RESOLUTION, String.format("%sx%s", metrics.widthPixels, metrics.heightPixels)); addResult(SCREEN_DENSITY, metrics.density); addResult(SCREEN_X_DENSITY, metrics.xdpi);