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

Commit 26e76d86 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6975804 from 9649d433 to rvc-qpr2-release 

Change-Id: I55f94cf20ca953a9426e0efe926c5468e0f94f13
parents dca8fbb9 9649d433

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

+8 −9
Original line number Diff line number Diff line
@@ -3437,17 +3437,16 @@ public class DisplayPolicy { 
            }



            final InsetsState requestedState = controlTarget.getRequestedInsetsState();

            final InsetsSource nbSource = requestedState.peekSource(ITYPE_NAVIGATION_BAR);

            final InsetsSource sbSource = requestedState.peekSource(ITYPE_STATUS_BAR);

            final InsetsSource enbSource = requestedState.peekSource(ITYPE_EXTRA_NAVIGATION_BAR);

            final InsetsSource cbSource = requestedState.peekSource(ITYPE_CLIMATE_BAR);

            final @InsetsType int restorePositionTypes =

                    (requestedState.getSourceOrDefaultVisibility(ITYPE_NAVIGATION_BAR)

                    (nbSource != null && nbSource.isVisible() ? Type.navigationBars() : 0)

                    | (sbSource != null && sbSource.isVisible() ? Type.statusBars() : 0)

                    | (mExtraNavBarAlt != null && enbSource != null && enbSource.isVisible()

                            ? Type.navigationBars() : 0)

                    | (requestedState.getSourceOrDefaultVisibility(ITYPE_STATUS_BAR)

                            ? Type.statusBars() : 0)

                    | (mExtraNavBarAlt != null

                            && requestedState.getSourceOrDefaultVisibility(

                                    ITYPE_EXTRA_NAVIGATION_BAR)

                            ? Type.navigationBars() : 0)

                    | (mClimateBarAlt != null

                            && requestedState.getSourceOrDefaultVisibility(ITYPE_CLIMATE_BAR)

                    | (mClimateBarAlt != null && cbSource != null && cbSource.isVisible()

                            ? Type.statusBars() : 0);



            if (swipeTarget == mNavigationBar