diff options
2 files changed, 1 insertions, 16 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java index cab54d08b3ec..a444022a32d1 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java @@ -497,8 +497,7 @@ public class RotationButtonController { boolean canShowRotationButton() { return mIsNavigationBarShowing || mBehavior == WindowInsetsController.BEHAVIOR_DEFAULT - || isGesturalMode(mNavBarMode) - || mTaskBarVisible; + || isGesturalMode(mNavBarMode); } @DrawableRes diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/rotation/RotationButtonControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shared/rotation/RotationButtonControllerTest.kt index 9393a4f4eead..ee3d87089b6d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shared/rotation/RotationButtonControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shared/rotation/RotationButtonControllerTest.kt @@ -60,18 +60,4 @@ class RotationButtonControllerTest : SysuiTestCase() { assertThat(mController.canShowRotationButton()).isTrue() } - - @Test - fun ifTaskbarVisible_showRotationSuggestion() { - mController.onNavigationBarWindowVisibilityChange( /* showing = */ false) - mController.onBehaviorChanged(Display.DEFAULT_DISPLAY, - WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE) - mController.onNavigationModeChanged(WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON) - mController.onTaskbarStateChange( /* visible = */ false, /* stashed = */ false) - assertThat(mController.canShowRotationButton()).isFalse() - - mController.onTaskbarStateChange( /* visible = */ true, /* stashed = */ false) - - assertThat(mController.canShowRotationButton()).isTrue() - } } |