Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fe02d2a authored Mar 25, 2022 by Kohsuke Yatoh Committed by Automerger Merge Worker Mar 25, 2022

Merge "Move FEATURE_IME to TestApi" into tm-dev am: 5eae33da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17312285

Change-Id: I150c8947755381d1f4819782fa74b3c4253ee368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a0491f24 5eae33da

core/api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3250,6 +3250,7 @@ package android.window {
	method public void onDisplayAreaVanished(@NonNull android.window.DisplayAreaInfo);		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);		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_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_ONE_HANDED = 3; // 0x3
	field public static final int FEATURE_ROOT = 0; // 0x0		field public static final int FEATURE_ROOT = 0; // 0x0
	field public static final int FEATURE_SYSTEM_FIRST = 0; // 0x0		field public static final int FEATURE_SYSTEM_FIRST = 0; // 0x0

core/java/android/window/DisplayAreaOrganizer.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -108,7 +108,6 @@ public class DisplayAreaOrganizer extends WindowOrganizer {
	* the position and settings of the container manually. This is useful for foldable devices		* 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		* which require custom UX rules for the IME position (e.g. IME on one screen and the focused
	* app on another screen).		* app on another screen).
	* @hide
	*/		*/
	public static final int FEATURE_IME = FEATURE_SYSTEM_FIRST + 8;		public static final int FEATURE_IME = FEATURE_SYSTEM_FIRST + 8;