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

Commit af2a792b authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "The nav bar isn't restored when swiping an app up to home in landscape"... 

Merge "The nav bar isn't restored when swiping an app up to home in landscape" into sc-dev am: cb10463a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14660738

Change-Id: Ic736f24a5eb8f0bd4a78c8fc7ae37a6514d9b7a3
parents 457435cc cb10463a

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

+1 −1
Original line number Diff line number Diff line
@@ -1801,7 +1801,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            return false;

        }

        final FadeRotationAnimationController controller = mFadeRotationAnimationController;

        return controller == null || !controller.isTargetToken(w.mToken);

        return controller == null || !controller.isHandledToken(w.mToken);

    }



    void notifyInsetsChanged(Consumer<WindowState> dispatchInsetsChanged) {

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

+6 −1
Original line number Diff line number Diff line
@@ -123,8 +123,13 @@ public class FadeRotationAnimationController extends FadeAnimationController { 
    }



    /** Returns {@code true} if the window is handled by this controller. */

    boolean isHandledToken(WindowToken token) {

        return token == mNavBarToken || isTargetToken(token);

    }



    /** Returns {@code true} if the controller will run fade animations on the window. */

    boolean isTargetToken(WindowToken token) {

        return token == mNavBarToken || mTargetWindowTokens.contains(token);

        return mTargetWindowTokens.contains(token);

    }



    void setOnShowRunnable(Runnable onShowRunnable) {