From 983a9969dfeddc92b2df5c63169eb987b296376a Mon Sep 17 00:00:00 2001
From: RyanlwLin <ryanlwlin@google.com>
Date: Thu, 4 Jul 2019 15:37:55 +0800
Subject: [PATCH] Use DisplayContext to replace default context

When detecting gesturs, the threshold is based on the display metrics.
To get correct display metrics, we replace default context with displayContext.

Bug: 136425762
Test: atest TouchExploreTest
Test: atest MagnificationGestureHandlerTest

Change-Id: I2d6c5a0ef00966d9164e117fc65dac8131f7a175
---
 .../server/accessibility/AccessibilityInputFilter.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
index 303230b00c6f3..b6cbbacde1187 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
@@ -385,9 +385,10 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo
 
         for (int i = displaysList.size() - 1; i >= 0; i--) {
             final int displayId = displaysList.get(i).getDisplayId();
+            final Context displayContext = mContext.createDisplayContext(displaysList.get(i));
 
             if ((mEnabledFeatures & FLAG_FEATURE_TOUCH_EXPLORATION) != 0) {
-                TouchExplorer explorer = new TouchExplorer(mContext, mAms);
+                TouchExplorer explorer = new TouchExplorer(displayContext, mAms);
                 addFirstEventHandler(displayId, explorer);
                 mTouchExplorer.put(displayId, explorer);
             }
@@ -400,7 +401,7 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo
                 final boolean triggerable = (mEnabledFeatures
                         & FLAG_FEATURE_TRIGGERED_SCREEN_MAGNIFIER) != 0;
                 MagnificationGestureHandler magnificationGestureHandler =
-                        new MagnificationGestureHandler(mContext,
+                        new MagnificationGestureHandler(displayContext,
                                 mAms.getMagnificationController(),
                                 detectControlGestures, triggerable, displayId);
                 addFirstEventHandler(displayId, magnificationGestureHandler);