DO NOT MERGE Only check internal inset types if they exist am: d5f7ed2782

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

Change-Id: I0a18c928555e943ab23c5e49e16efbf37943605d
This commit is contained in:
Heemin Seog
2020-09-23 21:48:56 +00:00
committed by Automerger Merge Worker

View File

@@ -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