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

Commit 4e6fb0bc authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Apply getImeControlTarget() only for IME insets 

On an external display, getImeControlTarget returns the remote control
target of the defaul display. This is not desirable for non-IME insets.

Test: dumpsys and check the control target on external display.
Bug: 184325245
Change-Id: I79ee5caacb91d828e28ddb884cf6b8cbdea64386
parent 475d21c3

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

+11 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static com.android.server.wm.ImeInsetsSourceProviderProto.IS_IME_LAYOUT_D 
import static com.android.server.wm.WindowManagerService.H.UPDATE_MULTI_WINDOW_STACKS;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Trace;

import android.util.proto.ProtoOutputStream;

import android.view.InsetsSource;
@@ -90,6 +91,16 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
        onSourceChanged();

    }



    @Override

    void updateControlForTarget(@Nullable InsetsControlTarget target, boolean force) {

        if (target != null && target.getWindow() != null) {

            // ime control target could be a different window.

            // Refer WindowState#getImeControlTarget().

            target = target.getWindow().getImeControlTarget();

        }

        super.updateControlForTarget(target, force);

    }



    private void onSourceChanged() {

        if (mLastSource.equals(mSource)) {

            return;

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

+0 −5
Original line number Diff line number Diff line
@@ -307,11 +307,6 @@ class InsetsSourceProvider { 
            // to control the window for now.

            return;

        }

        if (target != null && target.getWindow() != null) {

            // ime control target could be a different window.

            // Refer WindowState#getImeControlTarget().

            target = target.getWindow().getImeControlTarget();

        }



        if (mWin != null && mWin.getSurfaceControl() == null) {

            // if window doesn't have a surface, set it null and return.