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

Commit 5d4f5ebf authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge changes I1268101d,Id40470f6 

* changes:
  Handle adjustResize flag properly on client
  Reparent IME window and handle non-fullscreen windows correctly
parents 3e555b6f 648e5881

core/java/android/view/InsetsAnimationControlImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.util.SparseSetArray; 
import android.view.InsetsState.InsetSide;

import android.view.SyncRtSurfaceTransactionApplier.SurfaceParams;

import android.view.WindowInsets.Type.InsetType;

import android.view.WindowManager.LayoutParams;



import com.android.internal.annotations.VisibleForTesting;
@@ -165,7 +166,8 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll 
            @Nullable @InsetSide SparseIntArray typeSideMap) {

        return state.calculateInsets(frame, false /* isScreenRound */,

                false /* alwaysConsumerNavBar */, null /* displayCutout */,

                null /* legacyContentInsets */, null /* legacyStableInsets */, typeSideMap)

                null /* legacyContentInsets */, null /* legacyStableInsets */,

                LayoutParams.SOFT_INPUT_ADJUST_RESIZE /* legacySoftInputMode*/, typeSideMap)

               .getInsets(mTypes);

    }

core/java/android/view/InsetsController.java

+27 −6
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ public class InsetsController implements WindowInsetsController { 


    private int mPendingTypesToShow;



    private int mLastLegacySoftInputMode;



    public InsetsController(ViewRootImpl viewRoot) {

        mViewRoot = viewRoot;

        mAnimCallback = () -> {
@@ -126,13 +128,17 @@ public class InsetsController implements WindowInsetsController { 
            }

            WindowInsets insets = state.calculateInsets(mFrame, mLastInsets.isRound(),

                    mLastInsets.shouldAlwaysConsumeNavBar(), mLastInsets.getDisplayCutout(),

                    mLastLegacyContentInsets, mLastLegacyStableInsets,

                    mLastLegacyContentInsets, mLastLegacyStableInsets, mLastLegacySoftInputMode,

                    null /* typeSideMap */);

            mViewRoot.mView.dispatchWindowInsetsAnimationProgress(insets);

        };

    }



    void onFrameChanged(Rect frame) {

        if (mFrame.equals(frame)) {

            return;

        }

        mViewRoot.notifyInsetsChanged();

        mFrame.set(frame);

    }
@@ -160,11 +166,12 @@ public class InsetsController implements WindowInsetsController { 
    @VisibleForTesting

    public WindowInsets calculateInsets(boolean isScreenRound,

            boolean alwaysConsumeNavBar, DisplayCutout cutout, Rect legacyContentInsets,

            Rect legacyStableInsets) {

            Rect legacyStableInsets, int legacySoftInputMode) {

        mLastLegacyContentInsets.set(legacyContentInsets);

        mLastLegacyStableInsets.set(legacyStableInsets);

        mLastLegacySoftInputMode = legacySoftInputMode;

        mLastInsets = mState.calculateInsets(mFrame, isScreenRound, alwaysConsumeNavBar, cutout,

                legacyContentInsets, legacyStableInsets,

                legacyContentInsets, legacyStableInsets, legacySoftInputMode,

                null /* typeSideMap */);

        return mLastInsets;

    }
@@ -257,11 +264,21 @@ public class InsetsController implements WindowInsetsController { 


    private void controlWindowInsetsAnimation(@InsetType int types,

            WindowInsetsAnimationControlListener listener, boolean fromIme) {

        // If the frame of our window doesn't span the entire display, the control API makes very

        // little sense, as we don't deal with negative insets. So just cancel immediately.

        if (!mState.getDisplayFrame().equals(mFrame)) {

            listener.onCancelled();

            return;

        }

        controlAnimationUnchecked(types, listener, mFrame, fromIme);

    }



    private void controlAnimationUnchecked(@InsetType int types,

            WindowInsetsAnimationControlListener listener, Rect frame, boolean fromIme) {

        if (types == 0) {

            // nothing to animate.

            return;

        }



        // TODO: Check whether we already have a controller.

        final ArraySet<Integer> internalTypes = mState.toInternalType(types);

        final SparseArray<InsetsSourceConsumer> consumers = new SparseArray<>();
@@ -285,7 +302,7 @@ public class InsetsController implements WindowInsetsController { 
        }



        final InsetsAnimationControlImpl controller = new InsetsAnimationControlImpl(consumers,

                mFrame, mState, listener, typesReady,

                frame, mState, listener, typesReady,

                () -> new SyncRtSurfaceTransactionApplier(mViewRoot.mView), this);

        mAnimationControls.add(controller);

    }
@@ -436,6 +453,7 @@ public class InsetsController implements WindowInsetsController { 
            // nothing to animate.

            return;

        }



        WindowInsetsAnimationControlListener listener = new WindowInsetsAnimationControlListener() {

            @Override

            public void onReady(WindowInsetsAnimationController controller, int types) {
@@ -479,7 +497,10 @@ public class InsetsController implements WindowInsetsController { 
        // TODO: Instead of clearing this here, properly wire up

        // InsetsAnimationControlImpl.finish() to remove this from mAnimationControls.

        mAnimationControls.clear();

        controlWindowInsetsAnimation(types, listener, fromIme);



        // Show/hide animations always need to be relative to the display frame, in order that shown

        // and hidden state insets are correct.

        controlAnimationUnchecked(types, listener, mState.getDisplayFrame(), fromIme);

    }



    private void hideDirectly(@InsetType int types) {

core/java/android/view/InsetsState.java

+31 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view; 
import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL;

import static android.view.ViewRootImpl.NEW_INSETS_MODE_IME;

import static android.view.ViewRootImpl.NEW_INSETS_MODE_NONE;

import static android.view.WindowInsets.Type.IME;

import static android.view.WindowInsets.Type.SIZE;

import static android.view.WindowInsets.Type.indexOf;
@@ -34,11 +35,13 @@ import android.util.SparseArray; 
import android.util.SparseIntArray;

import android.view.WindowInsets.Type;

import android.view.WindowInsets.Type.InsetType;

import android.view.WindowManager.LayoutParams;



import java.io.PrintWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Objects;



/**

 * Holder for state of system windows that cause window insets for all other windows in the system.
@@ -104,6 +107,11 @@ public class InsetsState implements Parcelable { 


    private final ArrayMap<Integer, InsetsSource> mSources = new ArrayMap<>();



    /**

     * The frame of the display these sources are relative to.

     */

    private final Rect mDisplayFrame = new Rect();



    public InsetsState() {

    }
@@ -124,7 +132,7 @@ public class InsetsState implements Parcelable { 
    public WindowInsets calculateInsets(Rect frame, boolean isScreenRound,

            boolean alwaysConsumeNavBar, DisplayCutout cutout,

            @Nullable Rect legacyContentInsets, @Nullable Rect legacyStableInsets,

            @Nullable @InsetSide SparseIntArray typeSideMap) {

            int legacySoftInputMode, @Nullable @InsetSide SparseIntArray typeSideMap) {

        Insets[] typeInsetsMap = new Insets[Type.SIZE];

        Insets[] typeMaxInsetsMap = new Insets[Type.SIZE];

        boolean[] typeVisibilityMap = new boolean[SIZE];
@@ -140,8 +148,12 @@ public class InsetsState implements Parcelable { 
            if (source == null) {

                continue;

            }

            if (ViewRootImpl.sNewInsetsMode != NEW_INSETS_MODE_FULL

                    && (type == TYPE_TOP_BAR || type == TYPE_NAVIGATION_BAR)) {



            boolean skipSystemBars = ViewRootImpl.sNewInsetsMode != NEW_INSETS_MODE_FULL

                    && (type == TYPE_TOP_BAR || type == TYPE_NAVIGATION_BAR);

            boolean skipIme = source.getType() == TYPE_IME

                    && (legacySoftInputMode & LayoutParams.SOFT_INPUT_ADJUST_RESIZE) == 0;

            if (skipSystemBars || skipIme) {

                typeVisibilityMap[indexOf(toPublicType(type))] = source.isVisible();

                continue;

            }
@@ -209,6 +221,14 @@ public class InsetsState implements Parcelable { 
        return mSources.computeIfAbsent(type, InsetsSource::new);

    }



    public void setDisplayFrame(Rect frame) {

        mDisplayFrame.set(frame);

    }



    public Rect getDisplayFrame() {

        return mDisplayFrame;

    }



    /**

     * Modifies the state of this class to exclude a certain type to make it ready for dispatching

     * to the client.
@@ -224,6 +244,7 @@ public class InsetsState implements Parcelable { 
    }



    public void set(InsetsState other, boolean copySources) {

        mDisplayFrame.set(other.mDisplayFrame);

        mSources.clear();

        if (copySources) {

            for (int i = 0; i < other.mSources.size(); i++) {
@@ -323,6 +344,9 @@ public class InsetsState implements Parcelable { 


        InsetsState state = (InsetsState) o;



        if (!mDisplayFrame.equals(state.mDisplayFrame)) {

            return false;

        }

        if (mSources.size() != state.mSources.size()) {

            return false;

        }
@@ -341,7 +365,7 @@ public class InsetsState implements Parcelable { 


    @Override

    public int hashCode() {

        return mSources.hashCode();

        return Objects.hash(mDisplayFrame, mSources);

    }



    public InsetsState(Parcel in) {
@@ -355,9 +379,10 @@ public class InsetsState implements Parcelable { 


    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeParcelable(mDisplayFrame, flags);

        dest.writeInt(mSources.size());

        for (int i = 0; i < mSources.size(); i++) {

            dest.writeParcelable(mSources.valueAt(i), 0 /* flags */);

            dest.writeParcelable(mSources.valueAt(i), flags);

        }

    }
@@ -374,6 +399,7 @@ public class InsetsState implements Parcelable { 


    public void readFromParcel(Parcel in) {

        mSources.clear();

        mDisplayFrame.set(in.readParcelable(null /* loader */));

        final int size = in.readInt();

        for (int i = 0; i < size; i++) {

            final InsetsSource source = in.readParcelable(null /* loader */);

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -1887,7 +1887,7 @@ public final class ViewRootImpl implements ViewParent, 
                mLastWindowInsets = mInsetsController.calculateInsets(

                        mContext.getResources().getConfiguration().isScreenRound(),

                        mAttachInfo.mAlwaysConsumeNavBar, displayCutout,

                        contentInsets, stableInsets);

                        contentInsets, stableInsets, mWindowAttributes.softInputMode);

            } else {

                mLastWindowInsets = new WindowInsets(contentInsets, stableInsets,

                        mContext.getResources().getConfiguration().isScreenRound(),

core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view; 
import static android.view.ImeInsetsSourceConsumer.areEditorsSimilar;

import static android.view.InsetsState.TYPE_IME;



import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;

import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;
@@ -73,7 +74,7 @@ public class ImeInsetsSourceConsumerTest { 
                    false,

                    new DisplayCutout(

                            Insets.of(10, 10, 10, 10), rect, rect, rect, rect),

                    rect, rect);

                    rect, rect, SOFT_INPUT_ADJUST_RESIZE);

            mImeConsumer = new ImeInsetsSourceConsumer(

                    new InsetsState(), Transaction::new, mController);

        });