aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-02-02 23:58:02 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-02-02 23:58:02 +0000
commitb52a90d9e9e64ada64a44fab24d671e76f812502 (patch)
treee8abc63b3d6cdd8fd43cdad71752f0b3328c0b0f
parentb7d78db074a25a27eaf8c840cf91410898978847 (diff)
parent9810aeaf50dfc294b0734b17e19af195d8a502a7 (diff)
downloadlayoutlib-b52a90d9e9e64ada64a44fab24d671e76f812502.tar.gz
Snap for 11400057 from 9810aeaf50dfc294b0734b17e19af195d8a502a7 to simpleperf-release
Change-Id: I90ad3b71a292e154591df2f8357d44fa7f759cdc
-rw-r--r--bridge/src/android/view/WindowManagerImpl.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/bridge/src/android/view/WindowManagerImpl.java b/bridge/src/android/view/WindowManagerImpl.java
index e8b9fcf802..eb1e22c736 100644
--- a/bridge/src/android/view/WindowManagerImpl.java
+++ b/bridge/src/android/view/WindowManagerImpl.java
@@ -272,16 +272,15 @@ public class WindowManagerImpl implements WindowManager {
private WindowInsets computeWindowInsets() {
try {
final InsetsState insetsState = new InsetsState();
- final boolean alwaysConsumeSystemBars =
- WindowManagerGlobal.getWindowManagerService().getWindowInsets(
- mContext.getDisplayId(), null /* token */, insetsState);
+ WindowManagerGlobal.getWindowManagerService().getWindowInsets(mContext.getDisplayId(),
+ null /* token */, insetsState);
final Configuration config = mContext.getResources().getConfiguration();
final boolean isScreenRound = config.isScreenRound();
- final int windowingMode = config.windowConfiguration.getWindowingMode();
+ final int activityType = config.windowConfiguration.getActivityType();
return insetsState.calculateInsets(getCurrentBounds(mContext),
- null /* ignoringVisibilityState*/, isScreenRound, alwaysConsumeSystemBars,
- SOFT_INPUT_ADJUST_NOTHING, 0, SYSTEM_UI_FLAG_VISIBLE, TYPE_APPLICATION,
- windowingMode, null /* typeSideMap */);
+ null /* ignoringVisibilityState */, isScreenRound, SOFT_INPUT_ADJUST_NOTHING,
+ 0 /* legacySystemUiFlags */, SYSTEM_UI_FLAG_VISIBLE, TYPE_APPLICATION,
+ activityType, null /* typeSideMap */);
} catch (RemoteException ignore) {
}
return null;