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

Merge "Revert "Make extra navigation bar count towards non decor frame (3/3)"" into tm-qpr-dev

Browse Source
This commit is contained in:
Alyssa Ketpreechasawat
2022-09-15 13:27:25 +00:00
committed by Android (Google) Code Review
parent 84e2c20b42 aa0e31a7d2
commit c6588c2fb2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -2111,10 +2111,12 @@ public class DisplayPolicy {
} }
} }
// TODO (b/235842600): Use public type once we can treat task bar as navigation bar.
static final int[] INTERNAL_DECOR_TYPES; static final int[] INTERNAL_DECOR_TYPES;
static { static {
final ArraySet<Integer> decorTypes = InsetsState.toInternalType( final ArraySet<Integer> decorTypes = InsetsState.toInternalType(
Type.displayCutout() | Type.navigationBars()); Type.displayCutout() | Type.navigationBars());
decorTypes.remove(ITYPE_EXTRA_NAVIGATION_BAR);
INTERNAL_DECOR_TYPES = new int[decorTypes.size()]; INTERNAL_DECOR_TYPES = new int[decorTypes.size()];
for (int i = 0; i < INTERNAL_DECOR_TYPES.length; i++) { for (int i = 0; i < INTERNAL_DECOR_TYPES.length; i++) {
INTERNAL_DECOR_TYPES[i] = decorTypes.valueAt(i); INTERNAL_DECOR_TYPES[i] = decorTypes.valueAt(i);
@@ -2147,6 +2149,7 @@ public class DisplayPolicy {
} }
} }
// TODO (b/235842600): Remove this method once we can treat task bar as navigation bar.
private static Insets calculateDecorInsetsWithInternalTypes(InsetsState state) { private static Insets calculateDecorInsetsWithInternalTypes(InsetsState state) {
final Rect frame = state.getDisplayFrame(); final Rect frame = state.getDisplayFrame();
Insets insets = Insets.NONE; Insets insets = Insets.NONE;