diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/FadeRotationAnimationController.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 2bb863138ce2..306137a313f7 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -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) { diff --git a/services/core/java/com/android/server/wm/FadeRotationAnimationController.java b/services/core/java/com/android/server/wm/FadeRotationAnimationController.java index 644256a071ff..53b6b41db2ba 100644 --- a/services/core/java/com/android/server/wm/FadeRotationAnimationController.java +++ b/services/core/java/com/android/server/wm/FadeRotationAnimationController.java @@ -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) { |