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

Commit a1eba64e authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Revert "Move PiP when it occludes a keep clear area with naive a...""... 

Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd27 am: 56375b70 am: a9c3f089 am: 8d6e03df

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



Change-Id: I208389269798c67847c81e88dcabb781dfc74aa7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60fa4a06 8d6e03df

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+3 −11
Original line number Original line Diff line number Diff line
@@ -65,7 +65,6 @@ import com.android.wm.shell.pip.PipUiEventLogger; 
import com.android.wm.shell.pip.phone.PhonePipMenuController;

import com.android.wm.shell.pip.phone.PhonePipMenuController;

import com.android.wm.shell.pip.phone.PipAppOpsListener;

import com.android.wm.shell.pip.phone.PipAppOpsListener;

import com.android.wm.shell.pip.phone.PipController;

import com.android.wm.shell.pip.phone.PipController;

import com.android.wm.shell.pip.phone.PipKeepClearAlgorithm;

import com.android.wm.shell.pip.phone.PipMotionHelper;

import com.android.wm.shell.pip.phone.PipMotionHelper;

import com.android.wm.shell.pip.phone.PipTouchHandler;

import com.android.wm.shell.pip.phone.PipTouchHandler;

import com.android.wm.shell.recents.RecentTasksController;

import com.android.wm.shell.recents.RecentTasksController;
@@ -213,8 +212,7 @@ public class WMShellModule { 
    @Provides

    @Provides

    static Optional<Pip> providePip(Context context, DisplayController displayController,

    static Optional<Pip> providePip(Context context, DisplayController displayController,

            PipAppOpsListener pipAppOpsListener, PipBoundsAlgorithm pipBoundsAlgorithm,

            PipAppOpsListener pipAppOpsListener, PipBoundsAlgorithm pipBoundsAlgorithm,

            PipKeepClearAlgorithm pipKeepClearAlgorithm, PipBoundsState pipBoundsState,

            PipBoundsState pipBoundsState, PipMediaController pipMediaController,

            PipMotionHelper pipMotionHelper, PipMediaController pipMediaController,

            PhonePipMenuController phonePipMenuController, PipTaskOrganizer pipTaskOrganizer,

            PhonePipMenuController phonePipMenuController, PipTaskOrganizer pipTaskOrganizer,

            PipTouchHandler pipTouchHandler, PipTransitionController pipTransitionController,

            PipTouchHandler pipTouchHandler, PipTransitionController pipTransitionController,

            WindowManagerShellWrapper windowManagerShellWrapper,

            WindowManagerShellWrapper windowManagerShellWrapper,
@@ -223,8 +221,8 @@ public class WMShellModule { 
            Optional<OneHandedController> oneHandedController,

            Optional<OneHandedController> oneHandedController,

            @ShellMainThread ShellExecutor mainExecutor) {

            @ShellMainThread ShellExecutor mainExecutor) {

        return Optional.ofNullable(PipController.create(context, displayController,

        return Optional.ofNullable(PipController.create(context, displayController,

                pipAppOpsListener, pipBoundsAlgorithm, pipKeepClearAlgorithm, pipBoundsState,

                pipAppOpsListener, pipBoundsAlgorithm, pipBoundsState,

                pipMotionHelper, pipMediaController, phonePipMenuController, pipTaskOrganizer,

                pipMediaController, phonePipMenuController, pipTaskOrganizer,

                pipTouchHandler, pipTransitionController, windowManagerShellWrapper,

                pipTouchHandler, pipTransitionController, windowManagerShellWrapper,

                taskStackListener, pipParamsChangedForwarder, oneHandedController, mainExecutor));

                taskStackListener, pipParamsChangedForwarder, oneHandedController, mainExecutor));

    }

    }
@@ -241,12 +239,6 @@ public class WMShellModule { 
        return new PipSnapAlgorithm();

        return new PipSnapAlgorithm();

    }

    }





    @WMSingleton

    @Provides

    static PipKeepClearAlgorithm providePipKeepClearAlgorithm() {

        return new PipKeepClearAlgorithm();

    }



    @WMSingleton

    @WMSingleton

    @Provides

    @Provides

    static PipBoundsAlgorithm providesPipBoundsAlgorithm(Context context,

    static PipBoundsAlgorithm providesPipBoundsAlgorithm(Context context,

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+2 −13
Original line number Original line Diff line number Diff line
@@ -109,9 +109,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
    private PipAppOpsListener mAppOpsListener;

    private PipAppOpsListener mAppOpsListener;

    private PipMediaController mMediaController;

    private PipMediaController mMediaController;

    private PipBoundsAlgorithm mPipBoundsAlgorithm;

    private PipBoundsAlgorithm mPipBoundsAlgorithm;

    private PipKeepClearAlgorithm mPipKeepClearAlgorithm;

    private PipBoundsState mPipBoundsState;

    private PipBoundsState mPipBoundsState;

    private PipMotionHelper mPipMotionHelper;

    private PipTouchHandler mTouchHandler;

    private PipTouchHandler mTouchHandler;

    private PipTransitionController mPipTransitionController;

    private PipTransitionController mPipTransitionController;

    private TaskStackListenerImpl mTaskStackListener;

    private TaskStackListenerImpl mTaskStackListener;
@@ -247,10 +245,6 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
                        Set<Rect> unrestricted) {

                        Set<Rect> unrestricted) {

                    if (mPipBoundsState.getDisplayId() == displayId) {

                    if (mPipBoundsState.getDisplayId() == displayId) {

                        mPipBoundsState.setKeepClearAreas(restricted, unrestricted);

                        mPipBoundsState.setKeepClearAreas(restricted, unrestricted);

                        mPipMotionHelper.moveToBounds(mPipKeepClearAlgorithm.adjust(

                                mPipBoundsState.getBounds(),

                                mPipBoundsState.getRestrictedKeepClearAreas(),

                                mPipBoundsState.getUnrestrictedKeepClearAreas()));

                    }

                    }

                }

                }

            };

            };
@@ -289,8 +283,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
    @Nullable

    @Nullable

    public static Pip create(Context context, DisplayController displayController,

    public static Pip create(Context context, DisplayController displayController,

            PipAppOpsListener pipAppOpsListener, PipBoundsAlgorithm pipBoundsAlgorithm,

            PipAppOpsListener pipAppOpsListener, PipBoundsAlgorithm pipBoundsAlgorithm,

            PipKeepClearAlgorithm pipKeepClearAlgorithm, PipBoundsState pipBoundsState,

            PipBoundsState pipBoundsState, PipMediaController pipMediaController,

            PipMotionHelper pipMotionHelper, PipMediaController pipMediaController,

            PhonePipMenuController phonePipMenuController, PipTaskOrganizer pipTaskOrganizer,

            PhonePipMenuController phonePipMenuController, PipTaskOrganizer pipTaskOrganizer,

            PipTouchHandler pipTouchHandler, PipTransitionController pipTransitionController,

            PipTouchHandler pipTouchHandler, PipTransitionController pipTransitionController,

            WindowManagerShellWrapper windowManagerShellWrapper,

            WindowManagerShellWrapper windowManagerShellWrapper,
@@ -305,7 +298,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
        }

        }





        return new PipController(context, displayController, pipAppOpsListener, pipBoundsAlgorithm,

        return new PipController(context, displayController, pipAppOpsListener, pipBoundsAlgorithm,

                pipKeepClearAlgorithm, pipBoundsState, pipMotionHelper, pipMediaController,

                pipBoundsState, pipMediaController,

                phonePipMenuController, pipTaskOrganizer, pipTouchHandler, pipTransitionController,

                phonePipMenuController, pipTaskOrganizer, pipTouchHandler, pipTransitionController,

                windowManagerShellWrapper, taskStackListener, pipParamsChangedForwarder,

                windowManagerShellWrapper, taskStackListener, pipParamsChangedForwarder,

                oneHandedController, mainExecutor)

                oneHandedController, mainExecutor)
@@ -316,9 +309,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
            DisplayController displayController,

            DisplayController displayController,

            PipAppOpsListener pipAppOpsListener,

            PipAppOpsListener pipAppOpsListener,

            PipBoundsAlgorithm pipBoundsAlgorithm,

            PipBoundsAlgorithm pipBoundsAlgorithm,

            PipKeepClearAlgorithm pipKeepClearAlgorithm,

            @NonNull PipBoundsState pipBoundsState,

            @NonNull PipBoundsState pipBoundsState,

            PipMotionHelper pipMotionHelper,

            PipMediaController pipMediaController,

            PipMediaController pipMediaController,

            PhonePipMenuController phonePipMenuController,

            PhonePipMenuController phonePipMenuController,

            PipTaskOrganizer pipTaskOrganizer,

            PipTaskOrganizer pipTaskOrganizer,
@@ -341,9 +332,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
        mWindowManagerShellWrapper = windowManagerShellWrapper;

        mWindowManagerShellWrapper = windowManagerShellWrapper;

        mDisplayController = displayController;

        mDisplayController = displayController;

        mPipBoundsAlgorithm = pipBoundsAlgorithm;

        mPipBoundsAlgorithm = pipBoundsAlgorithm;

        mPipKeepClearAlgorithm = pipKeepClearAlgorithm;

        mPipBoundsState = pipBoundsState;

        mPipBoundsState = pipBoundsState;

        mPipMotionHelper = pipMotionHelper;

        mPipTaskOrganizer = pipTaskOrganizer;

        mPipTaskOrganizer = pipTaskOrganizer;

        mMainExecutor = mainExecutor;

        mMainExecutor = mainExecutor;

        mMediaController = pipMediaController;

        mMediaController = pipMediaController;

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipKeepClearAlgorithm.java

deleted100644 → 0
+0 −44
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.pip.phone;



import android.graphics.Rect;



import java.util.Set;



/**

 * Calculates the adjusted position that does not occlude keep clear areas.

 */

public class PipKeepClearAlgorithm {



    /** Returns a new {@code Rect} that does not occlude the provided keep clear areas. */

    public Rect adjust(Rect defaultBounds, Set<Rect> restrictedKeepClearAreas,

            Set<Rect> unrestrictedKeepClearAreas) {

        if (restrictedKeepClearAreas.isEmpty()) {

            return defaultBounds;

        }

        // TODO(b/183746978): implement the adjustment algorithm

        // naively check if areas intersect, an if so move PiP upwards

        Rect outBounds = new Rect(defaultBounds);

        for (Rect r : restrictedKeepClearAreas) {

            if (r.intersect(outBounds)) {

                outBounds.offset(0, r.top - outBounds.bottom);

            }

        }

        return outBounds;

    }

}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java

+8 −9
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ public class PipControllerTest extends ShellTestCase { 
    @Mock private PhonePipMenuController mMockPhonePipMenuController;

    @Mock private PhonePipMenuController mMockPhonePipMenuController;

    @Mock private PipAppOpsListener mMockPipAppOpsListener;

    @Mock private PipAppOpsListener mMockPipAppOpsListener;

    @Mock private PipBoundsAlgorithm mMockPipBoundsAlgorithm;

    @Mock private PipBoundsAlgorithm mMockPipBoundsAlgorithm;

    @Mock private PipKeepClearAlgorithm mMockPipKeepClearAlgorithm;

    @Mock private PipSnapAlgorithm mMockPipSnapAlgorithm;

    @Mock private PipSnapAlgorithm mMockPipSnapAlgorithm;

    @Mock private PipMediaController mMockPipMediaController;

    @Mock private PipMediaController mMockPipMediaController;

    @Mock private PipTaskOrganizer mMockPipTaskOrganizer;

    @Mock private PipTaskOrganizer mMockPipTaskOrganizer;
@@ -100,12 +99,12 @@ public class PipControllerTest extends ShellTestCase { 
            return null;

            return null;

        }).when(mMockExecutor).execute(any());

        }).when(mMockExecutor).execute(any());

        mPipController = new PipController(mContext, mMockDisplayController,

        mPipController = new PipController(mContext, mMockDisplayController,

                mMockPipAppOpsListener, mMockPipBoundsAlgorithm, mMockPipKeepClearAlgorithm,

                mMockPipAppOpsListener, mMockPipBoundsAlgorithm,

                mMockPipBoundsState, mMockPipMotionHelper, mMockPipMediaController,

                mMockPipBoundsState, mMockPipMediaController,

                mMockPhonePipMenuController, mMockPipTaskOrganizer, mMockPipTouchHandler,

                mMockPhonePipMenuController, mMockPipTaskOrganizer, mMockPipTouchHandler,

                mMockPipTransitionController, mMockWindowManagerShellWrapper,

                mMockPipTransitionController, mMockWindowManagerShellWrapper,

                mMockTaskStackListener, mPipParamsChangedForwarder, mMockOneHandedController,

                mMockTaskStackListener, mPipParamsChangedForwarder,

                mMockExecutor);

                mMockOneHandedController, mMockExecutor);

        when(mMockPipBoundsAlgorithm.getSnapAlgorithm()).thenReturn(mMockPipSnapAlgorithm);

        when(mMockPipBoundsAlgorithm.getSnapAlgorithm()).thenReturn(mMockPipSnapAlgorithm);

        when(mMockPipTouchHandler.getMotionHelper()).thenReturn(mMockPipMotionHelper);

        when(mMockPipTouchHandler.getMotionHelper()).thenReturn(mMockPipMotionHelper);

    }

    }
@@ -133,12 +132,12 @@ public class PipControllerTest extends ShellTestCase { 
        when(spyContext.getPackageManager()).thenReturn(mockPackageManager);

        when(spyContext.getPackageManager()).thenReturn(mockPackageManager);





        assertNull(PipController.create(spyContext, mMockDisplayController,

        assertNull(PipController.create(spyContext, mMockDisplayController,

                mMockPipAppOpsListener, mMockPipBoundsAlgorithm, mMockPipKeepClearAlgorithm,

                mMockPipAppOpsListener, mMockPipBoundsAlgorithm,

                mMockPipBoundsState, mMockPipMotionHelper, mMockPipMediaController,

                mMockPipBoundsState, mMockPipMediaController,

                mMockPhonePipMenuController, mMockPipTaskOrganizer, mMockPipTouchHandler,

                mMockPhonePipMenuController, mMockPipTaskOrganizer, mMockPipTouchHandler,

                mMockPipTransitionController, mMockWindowManagerShellWrapper,

                mMockPipTransitionController, mMockWindowManagerShellWrapper,

                mMockTaskStackListener, mPipParamsChangedForwarder, mMockOneHandedController,

                mMockTaskStackListener, mPipParamsChangedForwarder,

                mMockExecutor));

                mMockOneHandedController, mMockExecutor));

    }

    }





    @Test

    @Test

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipKeepClearAlgorithmTest.java

deleted100644 → 0
+0 −96
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.pip.phone;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;



import android.graphics.Rect;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



import androidx.test.filters.SmallTest;



import com.android.wm.shell.ShellTestCase;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.Set;



/**

 * Unit tests against {@link PipKeepClearAlgorithm}.

 */

@RunWith(AndroidTestingRunner.class)

@SmallTest

@TestableLooper.RunWithLooper(setAsMainLooper = true)

public class PipKeepClearAlgorithmTest extends ShellTestCase {



    private PipKeepClearAlgorithm mPipKeepClearAlgorithm;





    @Before

    public void setUp() throws Exception {

        mPipKeepClearAlgorithm = new PipKeepClearAlgorithm();

    }



    @Test

    public void adjust_withCollidingRestrictedKeepClearAreas_movesBounds() {

        final Rect inBounds = new Rect(0, 0, 100, 100);

        final Rect keepClearRect = new Rect(50, 50, 150, 150);



        final Rect outBounds = mPipKeepClearAlgorithm.adjust(inBounds, Set.of(keepClearRect),

                Set.of());



        assertFalse(outBounds.contains(keepClearRect));

    }



    @Test

    public void adjust_withNonCollidingRestrictedKeepClearAreas_boundsDoNotChange() {

        final Rect inBounds = new Rect(0, 0, 100, 100);

        final Rect keepClearRect = new Rect(100, 100, 150, 150);



        final Rect outBounds = mPipKeepClearAlgorithm.adjust(inBounds, Set.of(keepClearRect),

                Set.of());



        assertEquals(inBounds, outBounds);

    }



    @Test

    public void adjust_withCollidingUnrestrictedKeepClearAreas_boundsDoNotChange() {

        // TODO(b/183746978): update this test to accommodate for the updated algorithm

        final Rect inBounds = new Rect(0, 0, 100, 100);

        final Rect keepClearRect = new Rect(50, 50, 150, 150);



        final Rect outBounds = mPipKeepClearAlgorithm.adjust(inBounds, Set.of(),

                Set.of(keepClearRect));



        assertEquals(inBounds, outBounds);

    }



    @Test

    public void adjust_withNonCollidingUnrestrictedKeepClearAreas_boundsDoNotChange() {

        final Rect inBounds = new Rect(0, 0, 100, 100);

        final Rect keepClearRect = new Rect(100, 100, 150, 150);



        final Rect outBounds = mPipKeepClearAlgorithm.adjust(inBounds, Set.of(),

                Set.of(keepClearRect));



        assertEquals(inBounds, outBounds);

    }

}