Merge "Revert "Allow transient taskbar to unstash over soft ime"" into tm-qpr-dev

This commit is contained in:
Sam Dubey
2022-11-16 15:20:30 +00:00
committed by Android (Google) Code Review

View File

@@ -757,11 +757,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
mIsImeShowing = hasAnyFlag(systemUiStateFlags, SYSUI_STATE_IME_SHOWING);
mIsImeSwitcherShowing = hasAnyFlag(systemUiStateFlags, SYSUI_STATE_IME_SWITCHER_SHOWING);
if (!mIsSystemGestureInProgress) {
if (mIsImeShowing || mIsImeSwitcherShowing) {
// Hide taskbar when IME is shown.
updateStateForFlag(FLAG_STASHED_IN_APP_AUTO, true);
}
updateStateForFlag(FLAG_STASHED_IN_APP_IME, shouldStashForIme());
animDuration = TASKBAR_STASH_DURATION_FOR_IME;
startDelay = getTaskbarStashStartDelayForIme();
@@ -775,12 +770,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
* * in small screen AND
* * 3 button nav AND
* * landscape (or seascape)
* We do not stash if taskbar is transient
*/
private boolean shouldStashForIme() {
if (DisplayController.isTransientTaskbar(mActivity)) {
return false;
}
return (mIsImeShowing || mIsImeSwitcherShowing) &&
!(isPhoneMode() && mActivity.isThreeButtonNav()
&& mActivity.getDeviceProfile().isLandscape);