diff options
5 files changed, 1 insertions, 14 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 33a06165c77a..a988acf1f4a9 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -4538,7 +4538,6 @@ package android.window { field public final int displayId; field public final boolean isDuplicateTouchToWallpaper; field public final boolean isFocusable; - field public final boolean isPreventSplitting; field public final boolean isTouchable; field public final boolean isTrustedOverlay; field public final boolean isVisible; diff --git a/core/java/android/view/InputWindowHandle.java b/core/java/android/view/InputWindowHandle.java index 6cd4a4033adf..3e529ccf064a 100644 --- a/core/java/android/view/InputWindowHandle.java +++ b/core/java/android/view/InputWindowHandle.java @@ -57,7 +57,7 @@ public final class InputWindowHandle { InputConfig.NO_INPUT_CHANNEL, InputConfig.NOT_FOCUSABLE, InputConfig.NOT_TOUCHABLE, - InputConfig.PREVENT_SPLITTING, + InputConfig.DEPRECATED_PREVENT_SPLITTING, InputConfig.DUPLICATE_TOUCH_TO_WALLPAPER, InputConfig.IS_WALLPAPER, InputConfig.PAUSE_DISPATCHING, diff --git a/core/java/android/window/WindowInfosListenerForTest.java b/core/java/android/window/WindowInfosListenerForTest.java index ac9bec305fff..6461f2a0fcda 100644 --- a/core/java/android/window/WindowInfosListenerForTest.java +++ b/core/java/android/window/WindowInfosListenerForTest.java @@ -103,12 +103,6 @@ public class WindowInfosListenerForTest { public final boolean isFocusable; /** - * True if the window is preventing splitting - */ - @SuppressLint("UnflaggedApi") // The API is only used for tests. - public final boolean isPreventSplitting; - - /** * True if the window duplicates touches received to wallpaper. */ @SuppressLint("UnflaggedApi") // The API is only used for tests. @@ -133,8 +127,6 @@ public class WindowInfosListenerForTest { this.transform = transform; this.isTouchable = (inputConfig & InputConfig.NOT_TOUCHABLE) == 0; this.isFocusable = (inputConfig & InputConfig.NOT_FOCUSABLE) == 0; - this.isPreventSplitting = (inputConfig - & InputConfig.PREVENT_SPLITTING) != 0; this.isDuplicateTouchToWallpaper = (inputConfig & InputConfig.DUPLICATE_TOUCH_TO_WALLPAPER) != 0; this.isWatchOutsideTouch = (inputConfig diff --git a/services/core/java/com/android/server/wm/InputConfigAdapter.java b/services/core/java/com/android/server/wm/InputConfigAdapter.java index ae6e72464555..e3ffe716271c 100644 --- a/services/core/java/com/android/server/wm/InputConfigAdapter.java +++ b/services/core/java/com/android/server/wm/InputConfigAdapter.java @@ -76,9 +76,6 @@ class InputConfigAdapter { LayoutParams.FLAG_NOT_TOUCHABLE, InputConfig.NOT_TOUCHABLE, false /* inverted */), new FlagMapping( - LayoutParams.FLAG_SPLIT_TOUCH, - InputConfig.PREVENT_SPLITTING, true /* inverted */), - new FlagMapping( LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH, InputConfig.WATCH_OUTSIDE_TOUCH, false /* inverted */), new FlagMapping( diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index 513ba1d49258..ab9abfc4a876 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -1001,7 +1001,6 @@ public class WindowStateTests extends WindowTestsBase { assertTrue(handleWrapper.isChanged()); assertTrue(testFlag(handle.inputConfig, InputConfig.WATCH_OUTSIDE_TOUCH)); - assertFalse(testFlag(handle.inputConfig, InputConfig.PREVENT_SPLITTING)); assertTrue(testFlag(handle.inputConfig, InputConfig.DISABLE_USER_ACTIVITY)); // The window of standard resizable task should not use surface crop as touchable region. assertFalse(handle.replaceTouchableRegionWithCrop); |