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

Commit 042c4e0c authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille
Browse files

Remove the last usage of Flags.enableDisplayFocusInShellTransitions 

Fix: 407922977
Flag: EXEMPT (changing flag)
Test: Presubmits
Change-Id: Ie877a779bff34e1ee1086e62d0e6588bb29b86a3
parent 0ec6b1d6

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

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.IBinder 
import android.view.SurfaceControl.Transaction

import android.view.WindowManager.TRANSIT_CHANGE

import android.view.animation.PathInterpolator

import android.window.DesktopExperienceFlags

import android.window.TransitionInfo

import android.window.TransitionRequestInfo

import android.window.WindowContainerTransaction
@@ -160,7 +161,7 @@ class DesktopImeHandler( 
    }



    private fun getFocusedTask(displayId: Int): ActivityManager.RunningTaskInfo? =

        if (Flags.enableDisplayFocusInShellTransitions()) {

        if (DesktopExperienceFlags.ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS.isTrue()) {

            shellTaskOrganizer.getRunningTaskInfo(focusTransitionObserver.globallyFocusedTaskId)

        } else {

            shellTaskOrganizer.getRunningTasks(displayId).find { taskInfo -> taskInfo.isFocused }