diff options
4 files changed, 15 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 07592014e2c2..2de539721195 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3302,6 +3302,10 @@ {@link Window#setEnsuringNavigationBarContrastWhenTransparent}. --> <bool name="config_navBarNeedsScrim">true</bool> + <!-- Controls whether seamless rotation should be allowed even though the navbar can move + (which normally prevents seamless rotation). --> + <bool name="config_allowSeamlessRotationDespiteNavBarMoving">false</bool> + <!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows. These values are in DPs and will be converted to pixel sizes internally. --> <string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets">16x16</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a00a294b535f..1ef2eb4a0435 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2875,6 +2875,7 @@ <java-symbol type="bool" name="config_navBarTapThrough" /> <java-symbol type="bool" name="config_navBarAlwaysShowOnSideEdgeGesture" /> <java-symbol type="bool" name="config_navBarNeedsScrim" /> + <java-symbol type="bool" name="config_allowSeamlessRotationDespiteNavBarMoving" /> <java-symbol type="dimen" name="config_backGestureInset" /> <java-symbol type="color" name="system_bar_background_semi_transparent" /> diff --git a/packages/overlays/NavigationBarModeGesturalOverlay/res/values/config.xml b/packages/overlays/NavigationBarModeGesturalOverlay/res/values/config.xml index 9694e76e138b..f1d2e0b27353 100644 --- a/packages/overlays/NavigationBarModeGesturalOverlay/res/values/config.xml +++ b/packages/overlays/NavigationBarModeGesturalOverlay/res/values/config.xml @@ -37,6 +37,10 @@ {@link Window#setEnsuringNavigationBarContrastWhenTransparent}. --> <bool name="config_navBarNeedsScrim">false</bool> + <!-- Controls whether seamless rotation should be allowed even though the navbar can move + (which normally prevents seamless rotation). --> + <bool name="config_allowSeamlessRotationDespiteNavBarMoving">true</bool> + <!-- Controls whether the side edge gestures can always trigger the transient nav bar to show. --> <bool name="config_navBarAlwaysShowOnSideEdgeGesture">true</bool> diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index b8504db8e810..197a3cf2b3ab 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -255,6 +255,7 @@ public class DisplayPolicy { private volatile boolean mNavigationBarCanMove; private volatile boolean mNavigationBarLetsThroughTaps; private volatile boolean mNavigationBarAlwaysShowOnSideGesture; + private volatile boolean mAllowSeamlessRotationDespiteNavBarMoving; // Written by vr manager thread, only read in this class. private volatile boolean mPersistentVrModeEnabled; @@ -2726,6 +2727,8 @@ public class DisplayPolicy { mNavigationBarCanMove = mDisplayContent.mBaseDisplayWidth != mDisplayContent.mBaseDisplayHeight && res.getBoolean(R.bool.config_navBarCanMove); + mAllowSeamlessRotationDespiteNavBarMoving = + res.getBoolean(R.bool.config_allowSeamlessRotationDespiteNavBarMoving); } /** @@ -3508,8 +3511,9 @@ public class DisplayPolicy { } // If the navigation bar can't change sides, then it will // jump when we change orientations and we don't rotate - // seamlessly. - if (!navigationBarCanMove()) { + // seamlessly - unless that is allowed, eg. with gesture + // navigation where the navbar is low-profile enough that this isn't very noticeable. + if (!navigationBarCanMove() && !mAllowSeamlessRotationDespiteNavBarMoving) { return false; } |