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

Commit 1f3bc934 authored by Yunfan Chen's avatar Yunfan Chen Committed by Automerger Merge Worker
Browse files

Merge "Use a more-specific heuristic to detect mirrored/virtual inset... 

Merge "Use a more-specific heuristic to detect mirrored/virtual inset providers" into rvc-dev am: c70711f6 am: a1328873

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

Change-Id: I0f10d8cc6e403ef11efcb1e502d6aa4bf6ed1a30
parents 77fdafd3 a1328873

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

+0 −5
Original line number Diff line number Diff line
@@ -5797,11 +5797,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                Slog.w(TAG, "Failed to deliver showInsets", e);

            }

        }



        @Override

        public boolean isClientControlled() {

            return false;

        }

    }



    /**

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

+0 −7
Original line number Diff line number Diff line
@@ -62,11 +62,4 @@ interface InsetsControlTarget { 
        return false;

    }



    /**

     * Returns {@code true} if the object controlling the insets is on client.

     */

    default boolean isClientControlled() {

        return true;

    }



}

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

+17 −3
Original line number Diff line number Diff line
@@ -351,14 +351,28 @@ class InsetsSourceProvider { 
    }



    private void updateVisibility() {

        final boolean isClientControlled = mControlTarget != null

                && mControlTarget.isClientControlled();

        mSource.setVisible(mServerVisible && (!isClientControlled || mClientVisible));

        mSource.setVisible(mServerVisible && (isMirroredSource() || mClientVisible));

        ProtoLog.d(WM_DEBUG_IME,

                "InsetsSource updateVisibility serverVisible: %s clientVisible: %s",

                mServerVisible, mClientVisible);

    }



    private boolean isMirroredSource() {

        if (mWin == null) {

            return false;

        }

        final int[] provides = mWin.mAttrs.providesInsetsTypes;

        if (provides == null) {

            return false;

        }

        for (int i = 0; i < provides.length; i++) {

            if (provides[i] == ITYPE_IME) {

                return true;

            }

        }

        return false;

    }



    InsetsSourceControl getControl(InsetsControlTarget target) {

        if (target == mControlTarget) {

            if (!mIsLeashReadyForDispatching && mControl != null) {