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

Commit 63276b9b authored by Heemin Seog's avatar Heemin Seog Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Only check internal inset types if they exist" into rvc-qpr-dev

parents d40a7cf8 d5f7ed27

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

+5 −2
Original line number Diff line number Diff line
@@ -3400,9 +3400,12 @@ public class DisplayPolicy { 
                            ? Type.navigationBars() : 0)

                    | (requestedState.getSourceOrDefaultVisibility(ITYPE_STATUS_BAR)

                            ? Type.statusBars() : 0)

                    | (requestedState.getSourceOrDefaultVisibility(ITYPE_EXTRA_NAVIGATION_BAR)

                    | (mExtraNavBarAlt != null

                            && requestedState.getSourceOrDefaultVisibility(

                                    ITYPE_EXTRA_NAVIGATION_BAR)

                            ? Type.navigationBars() : 0)

                    | (requestedState.getSourceOrDefaultVisibility(ITYPE_CLIMATE_BAR)

                    | (mClimateBarAlt != null

                            && requestedState.getSourceOrDefaultVisibility(ITYPE_CLIMATE_BAR)

                            ? Type.statusBars() : 0);



            if (swipeTarget == mNavigationBar