Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix FLAG_NOT_FOCUSABLE ime target" into rvc-dev am: adbd87e55b

Browse Source 
Change-Id: I40d2cdf2d9669634ac0e19cbe52efbcc65850786
This commit is contained in:
Automerger Merge Worker
2020-02-26 18:20:13 +00:00
parent 7b967f95a0 adbd87e55b
commit b7546f707b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2256,9 +2256,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
return false;
}
if (PixelFormat.formatHasAlpha(mAttrs.format)) {
// Support legacy use cases where transparent windows can still be ime target with
// FLAG_NOT_FOCUSABLE and ALT_FOCUSABLE_IM set.
if (PixelFormat.formatHasAlpha(mAttrs.format) && mAttrs.alpha == 0) {
// Support legacy use cases where completely transparent windows can still be ime target
// with FLAG_NOT_FOCUSABLE and ALT_FOCUSABLE_IM set.
// Certain apps listen for IME insets using transparent windows and ADJUST_NOTHING to
// manually synchronize app content to IME animation b/144619551.
// TODO(b/145812508): remove this once new focus management is complete b/141738570

2
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
View File

@@ -251,9 +251,11 @@ public class WindowStateTests extends WindowTestsBase {
// b/145812508: special legacy use-case for transparent/translucent windows.
appWindow.mAttrs.format = PixelFormat.TRANSPARENT;
appWindow.mAttrs.alpha = 0;
assertTrue(appWindow.canBeImeTarget());
appWindow.mAttrs.format = PixelFormat.OPAQUE;
appWindow.mAttrs.alpha = 1;
appWindow.mAttrs.flags &= ~FLAG_ALT_FOCUSABLE_IM;
assertFalse(appWindow.canBeImeTarget());
appWindow.mAttrs.flags &= ~FLAG_NOT_FOCUSABLE;