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

Commit aa0e31a7 authored by Alyssa Ketpreechasawat's avatar Alyssa Ketpreechasawat
Browse files

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

This reverts commit 6a6fbd2e.

Reason for revert: DroidMonitor: Potential culprit for Bug 246909852

Change-Id: I8979d1e4ed83bfbe092ad0c9f446c0d99d86245d
parent 6a6fbd2e

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;