| commit | 7562054ff5223797bb7e37733521b8c065e80b93 | [log] [tgz] |
|---|---|---|
| author | Maryam Dehaini <mdehaini@google.com> | Wed Oct 09 23:27:41 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 09 23:27:41 2024 +0000 |
| tree | 4aa984466f8a1be451ab662be3e0bba5dec39bb0 | |
| parent | fb68f5533ce2b31db58cb7ea13732bb07f56198f [diff] | |
| parent | 426870c0d2c2bca472585ce76ed8cb8d4cae9e86 [diff] |
Merge "Set caption bar height to status bar height when in fullscreen" into main
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index 40b83f0..2c621b1f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java
@@ -1601,7 +1601,7 @@ private static int getCaptionHeightIdStatic(@WindowingMode int windowingMode) { return windowingMode == WINDOWING_MODE_FULLSCREEN - ? R.dimen.desktop_mode_fullscreen_decor_caption_height + ? com.android.internal.R.dimen.status_bar_height_default : R.dimen.desktop_mode_freeform_decor_caption_height; }