Merge "Show floating rotation button regardless of ime status" into udc-qpr-dev (9107251a) · Commits · e / os / android_frameworks_base

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

+1 −10

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

	private AnimatedVectorDrawable mAnimatedDrawable;		private AnimatedVectorDrawable mAnimatedDrawable;
	private boolean mIsShowing;		private boolean mIsShowing;
	private boolean mCanShow = true;
	private int mDisplayRotation;		private int mDisplayRotation;

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

	@Override		@Override
	public boolean show() {		public boolean show() {
	if (!mCanShow \|\| mIsShowing) {		if (mIsShowing) {
	return false;		return false;
	}		}

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

	@Override
	public void setCanShowRotationButton(boolean canShow) {
	mCanShow = canShow;
	if (!mCanShow) {
	hide();
	}
	}

	@Override		@Override
	public void onTaskbarStateChanged(boolean taskbarVisible, boolean taskbarStashed) {		public void onTaskbarStateChanged(boolean taskbarVisible, boolean taskbarStashed) {
	mIsTaskbarVisible = taskbarVisible;		mIsTaskbarVisible = taskbarVisible;

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,6 @@ public interface RotationButton {
	default boolean isVisible() {		default boolean isVisible() {
	return false;		return false;
	}		}
	default void setCanShowRotationButton(boolean canShow) {}
	default void onTaskbarStateChanged(boolean taskbarVisible, boolean taskbarStashed) {}		default void onTaskbarStateChanged(boolean taskbarVisible, boolean taskbarStashed) {}
	default void updateIcon(int lightIconColor, int darkIconColor) { }		default void updateIcon(int lightIconColor, int darkIconColor) { }
	default void setOnClickListener(View.OnClickListener onClickListener) { }		default void setOnClickListener(View.OnClickListener onClickListener) { }

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -584,7 +584,6 @@ public class NavigationBarView extends FrameLayout {
	if (!visible) {		if (!visible) {
	mTransitionListener.onBackAltCleared();		mTransitionListener.onBackAltCleared();
	}		}
	mRotationButtonController.getRotationButton().setCanShowRotationButton(!visible);
	}		}

	void setDisabledFlags(int disabledFlags, SysUiState sysUiState) {		void setDisabledFlags(int disabledFlags, SysUiState sysUiState) {