Skip to content

Commit b74035f

Browse files
fix(android): enable edge-to-edge only for fullscreen modals (#11140)
1 parent c48322a commit b74035f

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

packages/core/ui/core/view/index.android.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -259,15 +259,12 @@ function initializeDialogFragment() {
259259
this._windowSoftInputMode = options.windowSoftInputMode;
260260
this.setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_TITLE, 0);
261261

262-
let theme = this.getTheme();
263-
if (this._fullscreen) {
264-
// In fullscreen mode, get the application's theme.
265-
theme = this.getActivity().getApplicationInfo().theme;
266-
}
267-
262+
const theme = this._fullscreen ? this.getActivity().getApplicationInfo().theme : this.getTheme();
268263
const dialog = new DialogImpl(this, this.getActivity(), theme);
269264

270-
Utils.android.enableEdgeToEdge(this.getActivity(), dialog.getWindow());
265+
if (this._fullscreen) {
266+
Utils.android.enableEdgeToEdge(this.getActivity(), dialog.getWindow());
267+
}
271268

272269
// do not override alignment unless fullscreen modal will be shown;
273270
// otherwise we might break component-level layout:
@@ -1333,7 +1330,7 @@ export class View extends ViewCommon {
13331330
const controller = window.getInsetsController?.();
13341331
if (controller) {
13351332
const APPEARANCE_LIGHT_STATUS_BARS = android.view.WindowInsetsController?.APPEARANCE_LIGHT_STATUS_BARS;
1336-
1333+
13371334
if (typeof value === 'string') {
13381335
this.style.statusBarStyle = value;
13391336
if (value === 'light') {

0 commit comments

Comments
 (0)