From f5e820058bef214abea0298235629d1055a176e6 Mon Sep 17 00:00:00 2001 From: Jacky Kao Date: Wed, 12 Aug 2020 09:49:36 +0800 Subject: [PATCH] Adding new A11y window type to A11y services Two window types, INPUT_METHOD and INPUT_METHOD_DIALOG are group into a single A11y window type, TYPE_INPUT_METHOD, at A11y framework such that A11y services could not do correct behavior when the input method dialog shows. Splitting out the INPUT_METHOD_DIALOG and mapping it to TYPE_APPLICATION to fix this issue. Bug: 154315649 Test: a11y CTS & unit tests Change-Id: I263398b20e75f48afebbe8d002994a00a110abdc --- .../server/accessibility/AccessibilityWindowManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index a75b64ce08f5f..34be9ca991878 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -707,12 +707,12 @@ public class AccessibilityWindowManager { case WindowManager.LayoutParams.TYPE_PHONE: case WindowManager.LayoutParams.TYPE_PRIORITY_PHONE: case WindowManager.LayoutParams.TYPE_TOAST: - case WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG: { + case WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG: + case WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG: { return AccessibilityWindowInfo.TYPE_APPLICATION; } - case WindowManager.LayoutParams.TYPE_INPUT_METHOD: - case WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG: { + case WindowManager.LayoutParams.TYPE_INPUT_METHOD: { return AccessibilityWindowInfo.TYPE_INPUT_METHOD; }