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

Commit 94121762 authored by Chris Banes's avatar Chris Banes Committed by Android (Google) Code Review
Browse files

Merge "Fix onPrepareActionMode() not being called" into nyc-dev

parents f71d7fee 3cff56b6

core/java/com/android/internal/app/WindowDecorActionBar.java

+3 −1
Original line number Diff line number Diff line
@@ -505,6 +505,9 @@ public class WindowDecorActionBar extends ActionBar implements 
        mContextView.killMode();

        ActionModeImpl mode = new ActionModeImpl(mContextView.getContext(), callback);

        if (mode.dispatchOnCreate()) {

            // This needs to be set before invalidate() so that it calls

            // onPrepareActionMode()

            mActionMode = mode;

            mode.invalidate();

            mContextView.initForMode(mode);

            animateToMode(true);
@@ -518,7 +521,6 @@ public class WindowDecorActionBar extends ActionBar implements 
                }

            }

            mContextView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);

            mActionMode = mode;

            return mode;

        }

        return null;