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

Commit 93cda9a0 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Ensure PopupDecorView is not IME-focusable during exit transition."... 

Merge "Ensure PopupDecorView is not IME-focusable during exit transition." into nyc-dev am: 64177e51
am: b5069e05

* commit 'b5069e05':
  Ensure PopupDecorView is not IME-focusable during exit transition.
parents 762e1a17 b5069e05

core/java/android/widget/PopupWindow.java

+2 −1
Original line number Diff line number Diff line
@@ -1651,10 +1651,11 @@ public class PopupWindow { 
        // to executing this method, so we can rely on that instead.

        final Transition exitTransition = mExitTransition;

        if (mIsAnchorRootAttached && exitTransition != null && decorView.isLaidOut()) {

            // The decor view is non-interactive during exit transitions.

            // The decor view is non-interactive and non-IME-focusable during exit transitions.

            final LayoutParams p = (LayoutParams) decorView.getLayoutParams();

            p.flags |= LayoutParams.FLAG_NOT_TOUCHABLE;

            p.flags |= LayoutParams.FLAG_NOT_FOCUSABLE;

            p.flags &= ~LayoutParams.FLAG_ALT_FOCUSABLE_IM;

            mWindowManager.updateViewLayout(decorView, p);



            // Once we start dismissing the decor view, all state (including