diff options
| author | 2024-12-03 03:35:05 +0000 | |
|---|---|---|
| committer | 2024-12-03 03:35:05 +0000 | |
| commit | 1eee264b029e860c1a9f98180515e4ca1b3a513c (patch) | |
| tree | e7db1464b82eca5c88d4ca817b3732593d7b076b | |
| parent | d91dc6f6dd796c5e1de50b2fad2de1c65b7abc5c (diff) | |
| parent | e1e859ea2c50cf0d819ed0a8e71082931636b5aa (diff) | |
Merge "Revert "Move focus for windows in freeform mode"" into main
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 31330204e8c6..e9c2cf8576cd 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -18,7 +18,6 @@ package android.view; import static android.adpf.Flags.adpfViewrootimplActionDownBoost; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; -import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.content.pm.ActivityInfo.OVERRIDE_SANDBOX_VIEW_BOUNDS_APIS; import static android.graphics.HardwareRenderer.SYNC_CONTEXT_IS_STOPPED; import static android.graphics.HardwareRenderer.SYNC_LOST_SURFACE_REWARD_IF_FOUND; @@ -2653,8 +2652,7 @@ public final class ViewRootImpl implements ViewParent, mStopped = stopped; final ThreadedRenderer renderer = mAttachInfo.mThreadedRenderer; if (renderer != null) { - if (DEBUG_DRAW) - Log.d(mTag, "WindowStopped on " + getTitle() + " set to " + mStopped); + if (DEBUG_DRAW) Log.d(mTag, "WindowStopped on " + getTitle() + " set to " + mStopped); renderer.setStopped(mStopped); } if (!mStopped) { @@ -7979,9 +7977,8 @@ public final class ViewRootImpl implements ViewParent, } private boolean moveFocusToAdjacentWindow(@FocusDirection int direction) { - final int windowingMode = getConfiguration().windowConfiguration.getWindowingMode(); - if (!(windowingMode == WINDOWING_MODE_MULTI_WINDOW - || windowingMode == WINDOWING_MODE_FREEFORM)) { + if (getConfiguration().windowConfiguration.getWindowingMode() + != WINDOWING_MODE_MULTI_WINDOW) { return false; } try { |