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

Commit 38c0102a authored by Holly Sun's avatar Holly Sun
Browse files

[a11y] Fix Switch Access keyboard input issue in AA+. 

See https://buganizer.corp.google.com/issues/308704236#comment7. The issue is only reproducible when "Swipe up to start search" is OFF.

Video: https://drive.google.com/file/d/14ONBHL-qK3xaDWVruSMdQXWRGisyBSc2/view?usp=sharing

Bug: 308704236
Flag: NA
Test: manual
Change-Id: If84c1fcdb65add658022520018e34ad958be6bc2
parent 8ed8d67d

src/com/android/launcher3/logging/KeyboardStateManager.java

+13 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ public class KeyboardStateManager { 
    // Height of the keyboard when it's shown.

    // mImeShownHeightPx>=mImeHeightPx always.

    private int mImeShownHeightPx;

    // Indicate if the latest All Apps session was started from a11y action (rather than a direct

    // user interaction).

    private boolean mLaunchedFromA11y;



    public enum KeyboardState {

        NO_IME_ACTION,
@@ -89,4 +92,14 @@ public class KeyboardStateManager { 
            mImeShownHeightPx = mImeHeightPx;

        }

    }



    /** Getter for {@code mLaunchedFromA11y} */

    public boolean getLaunchedFromA11y() {

        return mLaunchedFromA11y;

    }



    /** Setter for {@code mLaunchedFromA11y} */

    public void setLaunchedFromA11y(boolean fromA11y) {

        mLaunchedFromA11y = fromA11y;

    }

}

src/com/android/launcher3/views/AccessibilityActionsView.java

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public class AccessibilityActionsView extends View implements StateListener<Laun 
        }

        Launcher l = Launcher.getLauncher(getContext());

        if (action == R.string.all_apps_button_label) {

            l.getStatsLogManager().keyboardStateManager().setLaunchedFromA11y(true);

            l.getStateManager().goToState(ALL_APPS);

            return true;

        }