diff options
| author | 2022-03-25 17:58:40 +0000 | |
|---|---|---|
| committer | 2022-03-25 17:58:40 +0000 | |
| commit | 5eae33da58128daee7a82fa20bd01ab65d40f7bf (patch) | |
| tree | 62ff0d5c7f129954993a9fa778656af87b9e5842 | |
| parent | 39bd9e7b4604e87e8bc88754341d88967ae79e9e (diff) | |
| parent | 0300924d512045d3d06674d51276ca158d582509 (diff) | |
Merge "Move FEATURE_IME to TestApi" into tm-dev
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/window/DisplayAreaOrganizer.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index a67d002cdddf..f7bf716fe8e5 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<android.window.DisplayAreaAppearedInfo> 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 88ece5c536f6..011013671043 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; |