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

Commit 298ddd06 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove PREVENT_SPLITTING flag" into main

parents 73b131f8 2c486eca

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/view/InputWindowHandle.java

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/java/android/window/WindowInfosListenerForTest.java

+0 −8
Original line number Diff line number Diff line
@@ -102,12 +102,6 @@ public class WindowInfosListenerForTest { 
        @SuppressLint("UnflaggedApi") // The API is only used for tests.

        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.

         */
@@ -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

services/core/java/com/android/server/wm/InputConfigAdapter.java

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ class InputConfigAdapter { 
            new FlagMapping(

                    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 */),

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

+0 −1
Original line number Diff line number Diff line
@@ -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);