Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate status bar to the flexible insets API"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-12 09:51:09 +00:00
committed by Android (Google) Code Review
parent 981a832c3a b4bdd38d7c
commit 41dfed3e6a
6 changed files with 180 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/java/android/view/InsetsFrameProvider.java
View File

@@ -59,6 +59,7 @@ public class InsetsFrameProvider implements Parcelable {
private static final int HAS_INSETS_SIZE_OVERRIDE = 2;
private static Rect sTmpRect = new Rect();
private static Rect sTmpRect2 = new Rect();
/**
* The type of insets to provide.
@@ -88,6 +89,18 @@ public class InsetsFrameProvider implements Parcelable {
*/
public InsetsSizeOverride[] insetsSizeOverrides = null;
/**
* This field, if set, is indicating the insets needs to be at least the given size inside the
* display cutout safe area. This will be compared to the insets size calculated based on other
* attributes, and will be applied when this is larger. This is independent of the
* PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT in LayoutParams, as this is not going to change
* the layout of the window, but only change the insets frame. This can be applied to insets
* calculated based on all three source frames.
*
* Be cautious, this will not be in effect for the window types whose insets size is overridden.
*/
public Insets minimalInsetsSizeInDisplayCutoutSafe = null;
public InsetsFrameProvider(int type) {
this(type, SOURCE_FRAME, null, null);
}
@@ -202,7 +215,8 @@ public class InsetsFrameProvider implements Parcelable {
public static void calculateInsetsFrame(Rect displayFrame, Rect containerBounds,
Rect displayCutoutSafe, Rect inOutFrame, int source, Insets insetsSize,
@WindowManager.LayoutParams.PrivateFlags int privateFlags) {
@WindowManager.LayoutParams.PrivateFlags int privateFlags,
Insets displayCutoutSafeInsetsSize) {
boolean extendByCutout = false;
if (source == InsetsFrameProvider.SOURCE_DISPLAY) {
inOutFrame.set(displayFrame);
@@ -214,6 +228,33 @@ public class InsetsFrameProvider implements Parcelable {
if (insetsSize == null) {
return;
}
if (displayCutoutSafeInsetsSize != null) {
sTmpRect2.set(inOutFrame);
}
calculateInsetsFrame(inOutFrame, insetsSize);
if (extendByCutout) {
WindowLayout.extendFrameByCutout(displayCutoutSafe, displayFrame, inOutFrame, sTmpRect);
}
if (displayCutoutSafeInsetsSize != null) {
// The insets is at least with the given size within the display cutout safe area.
// Calculate the smallest size.
calculateInsetsFrame(sTmpRect2, displayCutoutSafeInsetsSize);
WindowLayout.extendFrameByCutout(displayCutoutSafe, displayFrame, sTmpRect2, sTmpRect);
// If it's larger than previous calculation, use it.
if (sTmpRect2.contains(inOutFrame)) {
inOutFrame.set(sTmpRect2);
}
}
}
/**
* Calculate the insets frame given the insets size and the source frame.
* @param inOutFrame the source frame.
* @param insetsSize the insets size. Only the first non-zero value will be taken.
*/
private static void calculateInsetsFrame(Rect inOutFrame, Insets insetsSize) {
// Only one side of the provider shall be applied. Check in the order of left - top -
// right - bottom, only the first non-zero value will be applied.
if (insetsSize.left != 0) {
@@ -227,10 +268,6 @@ public class InsetsFrameProvider implements Parcelable {
} else {
inOutFrame.setEmpty();
}
if (extendByCutout) {
WindowLayout.extendFrameByCutout(displayCutoutSafe, displayFrame, inOutFrame, sTmpRect);
}
}
/**