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

Commit c9568e39 authored by Suchi Amalapurapu's avatar Suchi Amalapurapu
Browse files

When tasks are moved to top or bottom, the app tokens are being rearranged. 

The window token rearrangement is defered if an animation is
underway. Force a focus recomputation when the window tokens are finally
rearranged so that we have a valid focused window.
parent 1d5b3a63

services/java/com/android/server/WindowManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -9629,6 +9629,10 @@ public class WindowManagerService extends IWindowManager.Stub 
                    moveInputMethodWindowsIfNeededLocked(false);

                    wallpaperMayChange = true;

                    mLayoutNeeded = true;

                    // Since the window list has been rebuilt, focus might

                    // have to be recomputed since the actual order of windows

                    // might have changed again.

                    focusMayChange = true;

                }

                

                int adjResult = 0;

services/java/com/android/server/am/ActivityManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -7182,7 +7182,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 














        if (DEBUG_TRANSITION) Log.v(TAG,















                "Prepare to back transition: task=" + task);













        mWindowManager.prepareAppTransition(WindowManagerPolicy.TRANSIT_TASK_TO_BACK);















        















        final int N = mHistory.size();















        int bottom = 0;










@@ -7212,7 +7211,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen













                mNoAnimActivities.add(r);















            }















        } else {













            mWindowManager.prepareAppTransition(WindowManagerPolicy.TRANSIT_TASK_TO_FRONT);













            mWindowManager.prepareAppTransition(WindowManagerPolicy.TRANSIT_TASK_TO_BACK);















        }















        mWindowManager.moveAppTokensToBottom(moved);















        if (VALIDATE_TOKENS) {