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

Commit 6e1081a4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add ime flag to DesktopExperienceFlags." into main

parents 198c0c89 2e276c83

core/java/android/window/DesktopExperienceFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX),

    ENABLE_DESKTOP_FIRST_BASED_DRAG_TO_MAXIMIZE(Flags::enableDesktopFirstBasedDragToMaximize, false,

            Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DRAG_TO_MAXIMIZE),

    ENABLE_DESKTOP_IME_BUGFIX(Flags::enableDesktopImeBugfix, false,

            Flags.FLAG_ENABLE_DESKTOP_IME_BUGFIX),

    ENABLE_DESKTOP_TAB_TEARING_LAUNCH_ANIMATION(

            Flags::enableDesktopTabTearingLaunchAnimation, false,

            Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_LAUNCH_ANIMATION),

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopImeHandler.kt

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.window.TransitionInfo 
import android.window.TransitionRequestInfo

import android.window.WindowContainerTransaction

import com.android.internal.protolog.ProtoLog

import com.android.window.flags.Flags

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.DisplayImeController
@@ -62,7 +61,7 @@ class DesktopImeHandler( 
    }



    private fun onInit() {

        if (Flags.enableDesktopImeBugfix()) {

        if (DesktopExperienceFlags.ENABLE_DESKTOP_IME_BUGFIX.isTrue()) {

            displayImeController.addPositionProcessor(this)

        }

    }