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

Commit 68655ec6 authored by lumark's avatar lumark Committed by android-build-merger
Browse files

Merge "Make sure to clear previous display's last focus window when...

Merge "Make sure to clear previous display's last focus window when reparenting task" into qt-qpr1-dev am: 4f57b5ed
am: 32248f52

Change-Id: I23f611b30374526579038dba626c39030018ec8f
parents 89600b8c 32248f52
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -1056,9 +1056,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
                // removing from parent.
                token.getParent().removeChild(token);
            }
            if (prevDc.mLastFocus == mCurrentFocus) {
                // The window has become the focus of this display, so it should not be notified
                // that it lost focus from the previous display.
            if (token.hasChild(prevDc.mLastFocus)) {
                // If the reparent window token contains previous display's last focus window, means
                // it will end up to gain window focus on the target display, so it should not be
                // notified that it lost focus from the previous display.
                prevDc.mLastFocus = null;
            }
        }