Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I00bc85f6f9fd88ea5e4f74f80dbd3576f0aa2715
This commit is contained in:
Shawn Lin
2021-05-24 11:32:31 +00:00
committed by Automerger Merge Worker
parent a54cfbf440 438542b4ca
commit f7875f0cd6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -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) {

7
services/core/java/com/android/server/wm/FadeRotationAnimationController.java
View File

@@ -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) {