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

Commit a1390853 authored by Tracy Zhou's avatar Tracy Zhou Committed by Bill Lin
Browse files

Show floating rotation button regardless of ime status 

Fixes: 297884066
Fixes: 294957625
Test: With ime on, rotate the screen. make sure the button shows
Change-Id: I6677c3cb115de3e0efb327b8553ae31e724044a4
(cherry picked from commit 77c28811)
parent 32d40f84

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

+1 −10
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ public class FloatingRotationButton implements RotationButton { 


    private AnimatedVectorDrawable mAnimatedDrawable;

    private boolean mIsShowing;

    private boolean mCanShow = true;

    private int mDisplayRotation;



    private boolean mIsTaskbarVisible = false;
@@ -150,7 +149,7 @@ public class FloatingRotationButton implements RotationButton { 


    @Override

    public boolean show() {

        if (!mCanShow || mIsShowing) {

        if (mIsShowing) {

            return false;

        }
@@ -221,14 +220,6 @@ public class FloatingRotationButton implements RotationButton { 
        mKeyButtonView.setDarkIntensity(darkIntensity);

    }



    @Override

    public void setCanShowRotationButton(boolean canShow) {

        mCanShow = canShow;

        if (!mCanShow) {

            hide();

        }

    }



    @Override

    public void onTaskbarStateChanged(boolean taskbarVisible, boolean taskbarStashed) {

        mIsTaskbarVisible = taskbarVisible;

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

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ public interface RotationButton { 
    default boolean isVisible() {

        return false;

    }

    default void setCanShowRotationButton(boolean canShow) {}

    default void onTaskbarStateChanged(boolean taskbarVisible, boolean taskbarStashed) {}

    default void updateIcon(int lightIconColor, int darkIconColor) { }

    default void setOnClickListener(View.OnClickListener onClickListener) { }

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+0 −1
Original line number Diff line number Diff line
@@ -584,7 +584,6 @@ public class NavigationBarView extends FrameLayout { 
        if (!visible) {

            mTransitionListener.onBackAltCleared();

        }

        mRotationButtonController.getRotationButton().setCanShowRotationButton(!visible);

    }



    void setDisabledFlags(int disabledFlags, SysUiState sysUiState) {