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

Commit 6c5c7f6f authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "PiP: Disable enterSplit for now." into sc-v2-dev am: b80e7c46 

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

Change-Id: Ieff5dcb48b157c401818ff981b1b1eedc15183cc
parents 80c5689f b80e7c46

libs/WindowManager/Shell/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ 
    <!-- PiP minimum size, which is a % based off the shorter side of display width and height -->

    <fraction name="config_pipShortestEdgePercent">40%</fraction>



    <!-- Show PiP enter split icon, which allows apps to directly enter splitscreen from PiP. -->

    <bool name="config_pipEnableEnterSplitButton">false</bool>



    <!-- Animation duration when using long press on recents to dock -->

    <integer name="long_press_dock_anim_duration">250</integer>

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

+3 −3
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ public class PipMenuView extends FrameLayout { 
    private static final float MENU_BACKGROUND_ALPHA = 0.3f;

    private static final float DISABLED_ACTION_ALPHA = 0.54f;



    private static final boolean ENABLE_ENTER_SPLIT = true;



    private int mMenuState;

    private boolean mAllowMenuTimeout = true;

    private boolean mAllowTouches = true;
@@ -277,6 +275,8 @@ public class PipMenuView extends FrameLayout { 
            boolean resizeMenuOnShow, boolean withDelay, boolean showResizeHandle) {

        mAllowMenuTimeout = allowMenuTimeout;

        mDidLastShowMenuResize = resizeMenuOnShow;

        final boolean enableEnterSplit =

                mContext.getResources().getBoolean(R.bool.config_pipEnableEnterSplitButton);

        if (mMenuState != menuState) {

            // Disallow touches if the menu needs to resize while showing, and we are transitioning

            // to/from a full menu state.
@@ -297,7 +297,7 @@ public class PipMenuView extends FrameLayout { 
                    mDismissButton.getAlpha(), 1f);

            ObjectAnimator enterSplitAnim = ObjectAnimator.ofFloat(mEnterSplitButton, View.ALPHA,

                    mEnterSplitButton.getAlpha(),

                    ENABLE_ENTER_SPLIT && mFocusedTaskAllowSplitScreen ? 1f : 0f);

                    enableEnterSplit && mFocusedTaskAllowSplitScreen ? 1f : 0f);

            if (menuState == MENU_STATE_FULL) {

                mMenuContainerAnimator.playTogether(menuAnim, settingsAnim, dismissAnim,

                        enterSplitAnim);