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

Merge "Keep frames when providing insets to freeform windows"

Browse Source
This commit is contained in:
Hiroki Sato
2022-09-20 00:57:18 +00:00
committed by Android (Google) Code Review
parent 2ae8a5690d bc27dc3921
commit 035b4234e2
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/wm/InsetsPolicy.java
View File

@@ -64,6 +64,7 @@ import android.view.InsetsState.InternalInsetsType;
import android.view.InternalInsetsAnimationController;
import android.view.SurfaceControl;
import android.view.SyncRtSurfaceTransactionApplier;
import android.view.WindowInsets;
import android.view.WindowInsets.Type;
import android.view.WindowInsetsAnimation;
import android.view.WindowInsetsAnimation.Bounds;
@@ -398,16 +399,13 @@ class InsetsPolicy {
if (WindowConfiguration.isFloating(windowingMode)
|| (windowingMode == WINDOWING_MODE_MULTI_WINDOW && isAlwaysOnTop)) {
// Keep frames, caption, and IME.
int types = WindowInsets.Type.captionBar();
if (windowingMode != WINDOWING_MODE_PINNED) {
types |= WindowInsets.Type.ime();
}
InsetsState newState = new InsetsState();
// Only caption and IME are needed.
if (state.peekSource(ITYPE_CAPTION_BAR) != null) {
newState.addSource(state.peekSource(ITYPE_CAPTION_BAR));
}
if (windowingMode != WINDOWING_MODE_PINNED && state.peekSource(ITYPE_IME) != null) {
newState.addSource(state.peekSource(ITYPE_IME));
}
newState.set(state, types);
state = newState;
stateCopied = true;
}