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

Commit 9ad8b30c authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Add a config to control split-screen task dimming" into tm-dev am: b15f154c 

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



Change-Id: I8f64c88483f613d56a9b6ebb8865f4a44db140a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d9dc514 b15f154c

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

+3 −0
Original line number Diff line number Diff line
@@ -100,4 +100,7 @@ 
    <!-- The default gravity for the picture-in-picture window.

         Currently, this maps to Gravity.BOTTOM | Gravity.RIGHT -->

    <integer name="config_defaultPictureInPictureGravity">0x55</integer>



    <!-- Whether to dim a split-screen task when the other is the IME target -->

    <bool name="config_dimNonImeAttachedSide">true</bool>

</resources>

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+6 −2
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    private int mOrientation;

    private int mRotation;



    private final boolean mDimNonImeSide;



    public SplitLayout(String windowName, Context context, Configuration configuration,

            SplitLayoutHandler splitLayoutHandler,

            SplitWindowManager.ParentContainerCallbacks parentContainerCallbacks,
@@ -131,6 +133,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        mRootBounds.set(configuration.windowConfiguration.getBounds());

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, null);

        resetDividerPosition();



        mDimNonImeSide = resources.getBoolean(R.bool.config_dimNonImeAttachedSide);

    }



    private int getDividerInsets(Resources resources, Display display) {
@@ -860,10 +864,10 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
            // Update target dim values

            mLastDim1 = mDimValue1;

            mTargetDim1 = imeTargetPosition == SPLIT_POSITION_BOTTOM_OR_RIGHT && mImeShown

                    ? ADJUSTED_NONFOCUS_DIM : 0.0f;

                    && mDimNonImeSide ? ADJUSTED_NONFOCUS_DIM : 0.0f;

            mLastDim2 = mDimValue2;

            mTargetDim2 = imeTargetPosition == SPLIT_POSITION_TOP_OR_LEFT && mImeShown

                    ? ADJUSTED_NONFOCUS_DIM : 0.0f;

                    && mDimNonImeSide ? ADJUSTED_NONFOCUS_DIM : 0.0f;



            // Calculate target bounds offset for IME

            mLastYOffset = mYOffsetForIme;