commit 2e8aa2f2ce017bc271e2d1d115a5cf989556c353
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 15 01:52:52 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 15 01:52:52 2017 +0000
tree 0320e42585f9b3234a58f8c864948915287813ce
parent 2ea5a39d763d021d26d24650bfc91269a9f0196b
parent ea46a6cdb95f0e5166256db4d7b62a5409dc3d5d

Merge "DO NOT MERGE: cherry-pick from the android o(cts) to fix the the magnification test" into nougat-mr1-cts-dev

tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
index b6dcd9d..f834542 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
@@ -19,11 +19,14 @@
 import android.accessibilityservice.AccessibilityService.MagnificationController;
 import android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener;
 import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.Instrumentation;
+import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Region;
 import android.provider.Settings;
 import android.test.InstrumentationTestCase;
 import android.util.DisplayMetrics;
+import android.view.WindowManager;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -39,6 +42,7 @@
     public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED =
             "accessibility_display_magnification_enabled";
     private StubMagnificationAccessibilityService mService;
+    private Instrumentation mInstrumentation;
 
     @Override
     public void setUp() throws Exception {
@@ -49,6 +53,7 @@
         // Starting the service will force the accessibility subsystem to examine its settings, so
         // it will update magnification in the process to disable it.
         mService = StubMagnificationAccessibilityService.enableSelf(this);
+        mInstrumentation = getInstrumentation();
     }
 
     @Override
@@ -79,8 +84,11 @@
 
     public void testSetScaleAndCenter() {
         final MagnificationController controller = mService.getMagnificationController();
-        final Resources res = getInstrumentation().getTargetContext().getResources();
-        final DisplayMetrics metrics = res.getDisplayMetrics();
+        final WindowManager wm = (WindowManager) mInstrumentation.getContext().getSystemService(
+                Context.WINDOW_SERVICE);
+        final DisplayMetrics metrics = new DisplayMetrics();
+        wm.getDefaultDisplay().getRealMetrics(metrics);
+
         final float scale = 2.0f;
         final float x = metrics.widthPixels / 4.0f;
         final float y = metrics.heightPixels / 4.0f;