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

Commit 49c74696 authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

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

parents c2f03ae0 9787ae6a
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -757,6 +757,11 @@ 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();
@@ -770,8 +775,12 @@ 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);