| commit | 0da097947d8a440537d9524f1be9c0d46befb9ef | [log] [tgz] |
|---|---|---|
| author | Madan Ankapura <mankapura@google.com> | Thu May 16 11:52:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 11:52:20 2013 -0700 |
| tree | 5fd8ea27c84e04da187c9d76b61ebff820869060 | |
| parent | 2c3cbc2ffd247e9d7d8e734910b3df330b824eeb [diff] | |
| parent | fca328ebf0a190eef510acf0e952fb9762ec93a7 [diff] |
am fca328eb: am 021273a5: Merge "Use real sizes for display metrics" into jb-mr2-dev * commit 'fca328ebf0a190eef510acf0e952fb9762ec93a7': Use real sizes for display metrics
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);