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

Commit 861c268d authored by Yunfan Chen's avatar Yunfan Chen Committed by Android (Google) Code Review
Browse files

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

parents e56320b8 6a6fbd2e

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

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

            final Rect frame = state.getDisplayFrame();

            Insets insets = Insets.NONE;