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

Merge "Check the transient state by using public types" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-03 23:41:10 +00:00
committed by Android (Google) Code Review
parent 0a87be97ce 203e005aa3
commit 5e68bf3be3
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ import android.view.InsetsState.InternalInsetsType;
import android.view.InternalInsetsAnimationController; import android.view.InternalInsetsAnimationController;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.view.SyncRtSurfaceTransactionApplier; import android.view.SyncRtSurfaceTransactionApplier;
import android.view.WindowInsets.Type;
import android.view.WindowInsetsAnimation; import android.view.WindowInsetsAnimation;
import android.view.WindowInsetsAnimation.Bounds; import android.view.WindowInsetsAnimation.Bounds;
import android.view.WindowInsetsAnimationControlListener; import android.view.WindowInsetsAnimationControlListener;
@@ -336,7 +337,7 @@ class InsetsPolicy {
private @Nullable InsetsControlTarget getStatusControlTarget(@Nullable WindowState focusedWin, private @Nullable InsetsControlTarget getStatusControlTarget(@Nullable WindowState focusedWin,
boolean fake) { boolean fake) {
if (mShowingTransientTypes.indexOf(ITYPE_STATUS_BAR) != -1 && !fake) { if (!fake && isShowingTransientTypes(Type.statusBars())) {
return mDummyControlTarget; return mDummyControlTarget;
} }
final WindowState notificationShade = mPolicy.getNotificationShade(); final WindowState notificationShade = mPolicy.getNotificationShade();
@@ -386,7 +387,7 @@ class InsetsPolicy {
// Force showing navigation bar while IME is visible. // Force showing navigation bar while IME is visible.
return null; return null;
} }
if (mShowingTransientTypes.indexOf(ITYPE_NAVIGATION_BAR) != -1 && !fake) { if (!fake && isShowingTransientTypes(Type.navigationBars())) {
return mDummyControlTarget; return mDummyControlTarget;
} }
if (focusedWin == mPolicy.getNotificationShade()) { if (focusedWin == mPolicy.getNotificationShade()) {
@@ -412,6 +413,16 @@ class InsetsPolicy {
return focusedWin; return focusedWin;
} }
private boolean isShowingTransientTypes(@Type.InsetsType int types) {
final IntArray showingTransientTypes = mShowingTransientTypes;
for (int i = showingTransientTypes.size() - 1; i >= 0; i--) {
if ((InsetsState.toPublicType(showingTransientTypes.get(i)) & types) != 0) {
return true;
}
}
return false;
}
/** /**
* Determines whether the remote insets controller should take control of system bars for all * Determines whether the remote insets controller should take control of system bars for all
* windows. * windows.