Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a01aff95 authored by Alyssa Ketpreechasawat's avatar Alyssa Ketpreechasawat Committed by Automerger Merge Worker
Browse files

Merge "Revert "Make extra navigation bar count towards non decor frame (3/3)""... 

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

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



Change-Id: Id91b0c9ea15cc62d89ba39ecc63c0731a103f490
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f201638 18ed5591

services/core/java/com/android/server/wm/DisplayPolicy.java

+3 −0
Original line number Diff line number Diff line
@@ -2110,10 +2110,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 ArraySet<Integer> decorTypes = InsetsState.toInternalType(

                    Type.displayCutout() | Type.navigationBars());

            decorTypes.remove(ITYPE_EXTRA_NAVIGATION_BAR);

            INTERNAL_DECOR_TYPES = new int[decorTypes.size()];

            for (int i = 0; i < INTERNAL_DECOR_TYPES.length; i++) {

                INTERNAL_DECOR_TYPES[i] = decorTypes.valueAt(i);
@@ -2146,6 +2148,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) {

            final Rect frame = state.getDisplayFrame();

            Insets insets = Insets.NONE;