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

Commit b2979d84 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Revert canShowRotationButton() check related to mTaskBarVisible" into... 

Merge "Revert canShowRotationButton() check related to mTaskBarVisible" into udc-qpr-dev am: abf9b4bb am: b6b02f64

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



Change-Id: I9489a021bfc25b6368f4aa4ba50b9348798976ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 637f9681 b6b02f64

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()

  }

}