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

Commit 8b435707 authored by Dan Stahr's avatar Dan Stahr Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Revert "Make extra navigation bar count towards non... 

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

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



Change-Id: I0e8e4cdcd39e21b1210fed75af5e0abc570b5b26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5047fff0 6e0e72c8

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

+26 −4
Original line number Diff line number Diff line
@@ -2007,8 +2007,7 @@ public class DisplayPolicy { 
                dc.getDisplayPolicy().simulateLayoutDisplay(df);

                final InsetsState insetsState = df.mInsetsState;

                final Rect displayFrame = insetsState.getDisplayFrame();

                final Insets decor = insetsState.calculateInsets(displayFrame, DECOR_TYPES,

                        true /* ignoreVisibility */);

                final Insets decor = calculateDecorInsetsWithInternalTypes(insetsState);

                final Insets statusBar = insetsState.calculateInsets(displayFrame,

                        Type.statusBars(), true /* ignoreVisibility */);

                mNonDecorInsets.set(decor.left, decor.top, decor.right, decor.bottom);
@@ -2040,8 +2039,17 @@ public class DisplayPolicy { 
            }

        }





        static final int DECOR_TYPES = Type.displayCutout() | Type.navigationBars();

        // 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);

            }

        }



        private final DisplayContent mDisplayContent;

        private final Info[] mInfoForRotation = new Info[4];
@@ -2068,6 +2076,20 @@ public class DisplayPolicy { 
                info.mNeedUpdate = true;

            }

        }



        // 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;

            for (int i = INTERNAL_DECOR_TYPES.length - 1; i >= 0; i--) {

                final InsetsSource source = state.peekSource(INTERNAL_DECOR_TYPES[i]);

                if (source != null) {

                    insets = Insets.max(source.calculateInsets(frame, true /* ignoreVisibility */),

                            insets);

                }

            }

            return insets;

        }

    }



    /**