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

Commit 18ed5591 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

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



Change-Id: I61feeb689e4565b96dd60d38a2511ba06bb72f8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5988a314 c6588c2f

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

+3 −0
Original line number Diff line number Diff line
@@ -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 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);
@@ -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) {

            final Rect frame = state.getDisplayFrame();

            Insets insets = Insets.NONE;