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

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19560913

Change-Id: I4550cd306c68f6cc2760e8e493c92ac8fd158e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yunfan Chen
2022-09-15 06:01:29 +00:00
committed by Automerger Merge Worker
parent df75ed03e6 861c268d6b
commit 14c619fdc7
1 changed files with 0 additions and 3 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,12 +2111,10 @@ 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);
@@ -2149,7 +2147,6 @@ 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;