diff options
| author | Xin Li <delphij@google.com> | 2023-12-08 13:14:13 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-12-08 13:14:13 -0800 |
| commit | 9810aeaf50dfc294b0734b17e19af195d8a502a7 (patch) | |
| tree | e8abc63b3d6cdd8fd43cdad71752f0b3328c0b0f | |
| parent | 494987d8dd9e361be3d2f9c33c0ab2907d9b04b6 (diff) | |
| parent | c8fd0020f25456fd90f20daf7fa7ba6c6e7bb472 (diff) | |
| download | layoutlib-9810aeaf50dfc294b0734b17e19af195d8a502a7.tar.gz | |
Merge Android 14 QPR1
Merged-In: Id88f6f00a1546ae459f36320b8979627b9767462
Bug: 315507370
Change-Id: I05d081ca29aef7ae112ef058555c16e732f6403e
| -rw-r--r-- | bridge/src/android/view/WindowManagerImpl.java | 13 |
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; |