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

This commit is contained in:
Heemin Seog
2020-09-23 21:13:00 +00:00
committed by Android (Google) Code Review

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