From 0300924d512045d3d06674d51276ca158d582509 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Tue, 22 Mar 2022 17:44:34 +0800 Subject: [PATCH] Move FEATURE_IME to TestApi This is to allow us to check if the IME is organized by WM Shell in CTS. Test: atest KeyboardVisibilityControlTest#testRestoreImeVisibility Bug: 223640691 Change-Id: I19457c4cd26e45a42ba4522fb8ef54a9682cda07 --- core/api/test-current.txt | 1 + core/java/android/window/DisplayAreaOrganizer.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/api/test-current.txt b/core/api/test-current.txt index a67d002cdddfb..f7bf716fe8e5e 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -3250,6 +3250,7 @@ package android.window { method public void onDisplayAreaVanished(@NonNull android.window.DisplayAreaInfo); method @CallSuper @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public java.util.List registerOrganizer(int); field public static final int FEATURE_DEFAULT_TASK_CONTAINER = 1; // 0x1 + field public static final int FEATURE_IME = 8; // 0x8 field public static final int FEATURE_ONE_HANDED = 3; // 0x3 field public static final int FEATURE_ROOT = 0; // 0x0 field public static final int FEATURE_SYSTEM_FIRST = 0; // 0x0 diff --git a/core/java/android/window/DisplayAreaOrganizer.java b/core/java/android/window/DisplayAreaOrganizer.java index 88ece5c536f61..0110136710436 100644 --- a/core/java/android/window/DisplayAreaOrganizer.java +++ b/core/java/android/window/DisplayAreaOrganizer.java @@ -108,7 +108,6 @@ public class DisplayAreaOrganizer extends WindowOrganizer { * the position and settings of the container manually. This is useful for foldable devices * which require custom UX rules for the IME position (e.g. IME on one screen and the focused * app on another screen). - * @hide */ public static final int FEATURE_IME = FEATURE_SYSTEM_FIRST + 8;