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

Commit 50e98a6a authored by Jerry Chang's avatar Jerry Chang
Browse files

Consolidate split layout adjust animation for showing IME panel 

Fix the getImeTarget always return null task target. Also make sure to
restore and prevent it adjust the split layout after IME is no longer
attached to any of split surface.

Fix: 224882069
Test: atest WMShellUnitTests
Test: toggle IME panel on the bottom split, verified it'll scrim top
      split and push up the split layout.
Change-Id: Icd0647db08a06d0401fc3c8c82929223a1bdcf7d
parent 4bb44e08

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

+18 −33
Original line number Original line Diff line number Diff line
@@ -513,10 +513,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    /** Apply recorded task layout to the {@link WindowContainerTransaction}. */

    /** Apply recorded task layout to the {@link WindowContainerTransaction}. */

    public void applyTaskChanges(WindowContainerTransaction wct,

    public void applyTaskChanges(WindowContainerTransaction wct,

            ActivityManager.RunningTaskInfo task1, ActivityManager.RunningTaskInfo task2) {

            ActivityManager.RunningTaskInfo task1, ActivityManager.RunningTaskInfo task2) {

        if (mImePositionProcessor.applyTaskLayoutForIme(wct, task1.token, task2.token)) {

            return;

        }



        if (!mBounds1.equals(mWinBounds1) || !task1.token.equals(mWinToken1)) {

        if (!mBounds1.equals(mWinBounds1) || !task1.token.equals(mWinToken1)) {

            wct.setBounds(task1.token, mBounds1);

            wct.setBounds(task1.token, mBounds1);

            wct.setSmallestScreenWidthDp(task1.token, getSmallestWidthDp(mBounds1));

            wct.setSmallestScreenWidthDp(task1.token, getSmallestWidthDp(mBounds1));
@@ -756,6 +752,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 




        private final int mDisplayId;

        private final int mDisplayId;





        private boolean mHasImeFocus;

        private boolean mImeShown;

        private boolean mImeShown;

        private int mYOffsetForIme;

        private int mYOffsetForIme;

        private float mDimValue1;

        private float mDimValue1;
@@ -778,25 +775,32 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        @Override

        @Override

        public int onImeStartPositioning(int displayId, int hiddenTop, int shownTop,

        public int onImeStartPositioning(int displayId, int hiddenTop, int shownTop,

                boolean showing, boolean isFloating, SurfaceControl.Transaction t) {

                boolean showing, boolean isFloating, SurfaceControl.Transaction t) {

            if (displayId != mDisplayId) return 0;

            if (displayId != mDisplayId || !mInitialized) {

                return 0;

            }



            final int imeTargetPosition = getImeTargetPosition();

            final int imeTargetPosition = getImeTargetPosition();

            if (!mInitialized || imeTargetPosition == SPLIT_POSITION_UNDEFINED) return 0;

            mHasImeFocus = imeTargetPosition != SPLIT_POSITION_UNDEFINED;

            if (!mHasImeFocus) {

                return 0;

            }



            mStartImeTop = showing ? hiddenTop : shownTop;

            mStartImeTop = showing ? hiddenTop : shownTop;

            mEndImeTop = showing ? shownTop : hiddenTop;

            mEndImeTop = showing ? shownTop : hiddenTop;

            mImeShown = showing;

            mImeShown = showing;





            // Update target dim values

            // Update target dim values

            mLastDim1 = mDimValue1;

            mLastDim1 = mDimValue1;

            mTargetDim1 = imeTargetPosition == SPLIT_POSITION_BOTTOM_OR_RIGHT && showing

            mTargetDim1 = imeTargetPosition == SPLIT_POSITION_BOTTOM_OR_RIGHT && mImeShown

                    ? ADJUSTED_NONFOCUS_DIM : 0.0f;

                    ? ADJUSTED_NONFOCUS_DIM : 0.0f;

            mLastDim2 = mDimValue2;

            mLastDim2 = mDimValue2;

            mTargetDim2 = imeTargetPosition == SPLIT_POSITION_TOP_OR_LEFT && showing

            mTargetDim2 = imeTargetPosition == SPLIT_POSITION_TOP_OR_LEFT && mImeShown

                    ? ADJUSTED_NONFOCUS_DIM : 0.0f;

                    ? ADJUSTED_NONFOCUS_DIM : 0.0f;





            // Calculate target bounds offset for IME

            // Calculate target bounds offset for IME

            mLastYOffset = mYOffsetForIme;

            mLastYOffset = mYOffsetForIme;

            final boolean needOffset = imeTargetPosition == SPLIT_POSITION_BOTTOM_OR_RIGHT

            final boolean needOffset = imeTargetPosition == SPLIT_POSITION_BOTTOM_OR_RIGHT

                    && !isFloating && !isLandscape(mRootBounds) && showing;

                    && !isFloating && !isLandscape(mRootBounds) && mImeShown;

            mTargetYOffset = needOffset ? getTargetYOffset() : 0;

            mTargetYOffset = needOffset ? getTargetYOffset() : 0;





            if (mTargetYOffset != mLastYOffset) {

            if (mTargetYOffset != mLastYOffset) {
@@ -815,15 +819,14 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
            // ImePositionProcessor#onImeVisibilityChanged directly in DividerView is not enough

            // ImePositionProcessor#onImeVisibilityChanged directly in DividerView is not enough

            // because DividerView won't receive onImeVisibilityChanged callback after it being

            // because DividerView won't receive onImeVisibilityChanged callback after it being

            // re-inflated.

            // re-inflated.

            mSplitWindowManager.setInteractive(

            mSplitWindowManager.setInteractive(!mImeShown || !mHasImeFocus);

                    !showing || imeTargetPosition == SPLIT_POSITION_UNDEFINED);





            return needOffset ? IME_ANIMATION_NO_ALPHA : 0;

            return needOffset ? IME_ANIMATION_NO_ALPHA : 0;

        }

        }





        @Override

        @Override

        public void onImePositionChanged(int displayId, int imeTop, SurfaceControl.Transaction t) {

        public void onImePositionChanged(int displayId, int imeTop, SurfaceControl.Transaction t) {

            if (displayId != mDisplayId) return;

            if (displayId != mDisplayId || !mHasImeFocus) return;

            onProgress(getProgress(imeTop));

            onProgress(getProgress(imeTop));

            mSplitLayoutHandler.onLayoutPositionChanging(SplitLayout.this);

            mSplitLayoutHandler.onLayoutPositionChanging(SplitLayout.this);

        }

        }
@@ -831,7 +834,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        @Override

        @Override

        public void onImeEndPositioning(int displayId, boolean cancel,

        public void onImeEndPositioning(int displayId, boolean cancel,

                SurfaceControl.Transaction t) {

                SurfaceControl.Transaction t) {

            if (displayId != mDisplayId || cancel) return;

            if (displayId != mDisplayId || !mHasImeFocus || cancel) return;

            onProgress(1.0f);

            onProgress(1.0f);

            mSplitLayoutHandler.onLayoutPositionChanging(SplitLayout.this);

            mSplitLayoutHandler.onLayoutPositionChanging(SplitLayout.this);

        }

        }
@@ -843,6 +846,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
            if (!controlling && mImeShown) {

            if (!controlling && mImeShown) {

                reset();

                reset();

                mSplitWindowManager.setInteractive(true);

                mSplitWindowManager.setInteractive(true);

                mSplitLayoutHandler.setLayoutOffsetTarget(0, 0, SplitLayout.this);

                mSplitLayoutHandler.onLayoutPositionChanging(SplitLayout.this);

                mSplitLayoutHandler.onLayoutPositionChanging(SplitLayout.this);

            }

            }

        }

        }
@@ -876,32 +880,13 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        }

        }





        void reset() {

        void reset() {

            mHasImeFocus = false;

            mImeShown = false;

            mImeShown = false;

            mYOffsetForIme = mLastYOffset = mTargetYOffset = 0;

            mYOffsetForIme = mLastYOffset = mTargetYOffset = 0;

            mDimValue1 = mLastDim1 = mTargetDim1 = 0.0f;

            mDimValue1 = mLastDim1 = mTargetDim1 = 0.0f;

            mDimValue2 = mLastDim2 = mTargetDim2 = 0.0f;

            mDimValue2 = mLastDim2 = mTargetDim2 = 0.0f;

        }

        }





        /**

         * Applies adjusted task layout for showing IME.

         *

         * @return {@code false} if there's no need to adjust, otherwise {@code true}

         */

        boolean applyTaskLayoutForIme(WindowContainerTransaction wct,

                WindowContainerToken token1, WindowContainerToken token2) {

            if (mYOffsetForIme == 0) return false;



            mTempRect.set(mBounds1);

            mTempRect.offset(0, mYOffsetForIme);

            wct.setBounds(token1, mTempRect);



            mTempRect.set(mBounds2);

            mTempRect.offset(0, mYOffsetForIme);

            wct.setBounds(token2, mTempRect);



            return true;

        }



        /**

        /**

         * Adjusts surface layout while showing IME.

         * Adjusts surface layout while showing IME.

         *

         *

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -812,7 +812,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
                }

                }





                // Avoid WindowState#getRootTask() so we don't attribute system windows to a task.

                // Avoid WindowState#getRootTask() so we don't attribute system windows to a task.

                final Task task = imeLayeringTarget.getWindow().asTask();

                final Task task = imeLayeringTarget.getWindow().getTask();

                if (task == null) {

                if (task == null) {

                    return null;

                    return null;

                }

                }