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

Commit ec9cecd0 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Revert canShowRotationButton() check related to mTaskBarVisible 

mTaskBarVisible isn't related to immersive mode. Rather it's tied to whether we show task bar or hotseat (e.g. on the home screen).

Fixes: 272164624
Test: Open townhall. Fold and then unfold. Tilt the device and make sure the floating rotation button shows.
Change-Id: Ie8a7c617ece45509c5d069741cdee7e3037130f8
parent 68d69d63

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java

+1 −2
Original line number Diff line number Diff line
@@ -497,8 +497,7 @@ public class RotationButtonController { 
    boolean canShowRotationButton() {

        return mIsNavigationBarShowing

            || mBehavior == WindowInsetsController.BEHAVIOR_DEFAULT

            || isGesturalMode(mNavBarMode)

            || mTaskBarVisible;

            || isGesturalMode(mNavBarMode);

    }



    @DrawableRes

packages/SystemUI/tests/src/com/android/systemui/shared/rotation/RotationButtonControllerTest.kt

+0 −14
Original line number Diff line number Diff line
@@ -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()

  }

}