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

Commit ba9c51a7 authored by Ebru Kurnaz's avatar Ebru Kurnaz
Browse files

Fix Gboard keyboard pill appear on wrong screen. 

Flag: com.android.server.display.feature.flags.enable_display_content_mode_management
Bug: 401579119
Test: atest DisplayContentTests
Change-Id: If3ba3aaaa11404099562e47890e78f5749e9c3b9
parent 01c534a5

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

+4 −1
Original line number Diff line number Diff line
@@ -4323,8 +4323,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            return DISPLAY_IME_POLICY_FALLBACK_DISPLAY;

        }

        final int imePolicy = mWmService.mDisplayWindowSettings.getImePolicyLocked(this);

        // Show IME locally if display is eligible for desktop mode and the flag is enabled.

        if (imePolicy == DISPLAY_IME_POLICY_FALLBACK_DISPLAY

                && isPublicSecondaryDisplayWithDesktopModeForceEnabled()) {

                && (isPublicSecondaryDisplayWithDesktopModeForceEnabled()

                    || (DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue()

                    && (isSystemDecorationsSupported() && allowContentModeSwitch())))) {

            // If the display has not explicitly requested for the IME to be hidden then it shall

            // show the IME locally.

            return DISPLAY_IME_POLICY_LOCAL;