This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Use getBoundingRects to add support inset MediaQuery/SafeArea when in freeform mode controls are shown. #54294
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package io.flutter.embedding.android; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.Context; | ||
| import android.graphics.Rect; | ||
| import android.view.Window; | ||
| import android.view.WindowInsets; | ||
| import androidx.annotation.RequiresApi; | ||
| import androidx.annotation.VisibleForTesting; | ||
| import io.flutter.Build; | ||
| import io.flutter.embedding.engine.renderer.FlutterRenderer; | ||
| import io.flutter.util.ViewUtils; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A delegate class that performs the task of retrieving the bounding rect values. Logic that is | ||
| * independent of the engine, or that tests must access in the absence of an engine, shall reside | ||
| * within this class. | ||
| */ | ||
| public class FlutterViewDelegate { | ||
| /** | ||
| * Return the WindowInsets object for the provided Context. A Context will only have a window if | ||
| * it is an instance of Activity. If context does not have a window, or it is not an activity, | ||
| * this method will return null. Otherwise, this method will return the WindowInsets for the | ||
| * provided activity's window. | ||
|
|
||
| */ | ||
| @RequiresApi(api = Build.API_LEVELS.API_23) | ||
| @VisibleForTesting | ||
| public WindowInsets getWindowInsets(Context context) { | ||
| Activity activity = ViewUtils.getActivity(context); | ||
| if (activity == null) { | ||
| return null; | ||
| } | ||
| Window window = activity.getWindow(); | ||
| if (window == null) { | ||
| return null; | ||
| } | ||
| return window.getDecorView().getRootWindowInsets(); | ||
| } | ||
|
|
||
| @RequiresApi(api = Build.API_LEVELS.API_35) | ||
reidbaker marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| public List<Rect> getCaptionBarInsets(Context context) { | ||
| WindowInsets insets = getWindowInsets(context); | ||
reidbaker marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (insets == null) { | ||
| return Collections.emptyList(); | ||
| } | ||
| return insets.getBoundingRects(WindowInsets.Type.captionBar()); | ||
| } | ||
|
|
||
| @RequiresApi(api = Build.API_LEVELS.API_35) | ||
| public void growViewportMetricsToCaptionBar( | ||
| Context context, FlutterRenderer.ViewportMetrics viewportMetrics) { | ||
| List<Rect> boundingRects = getCaptionBarInsets(context); | ||
| int viewPaddingTop = viewportMetrics.viewPaddingTop; | ||
| for (Rect rect : boundingRects) { | ||
| viewPaddingTop = Math.max(viewPaddingTop, rect.bottom); | ||
| } | ||
| // The value getCaptionBarInset returns is only the bounding rects of the caption bar. | ||
| // When assigning the new value of viewPaddingTop, the maximum is taken with its old value | ||
| // to ensure that any previous top padding that is greater than that from the caption bar | ||
| // is not destroyed by this operation. | ||
| // Any potential update that will allow the caption bar to be positioned somewhere other than | ||
| // the top of the app window will require that this method be rewritten. | ||
| viewportMetrics.viewPaddingTop = viewPaddingTop; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Digging into go/customizable-window-headers I found APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND Can you test an app with that flag set vs the default and come up with a recommendation on if we should apply transparent caption bar by default or not?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment should not be considered blocking.