Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9412176

* commit '94121762ff47728fd8080f45f04cafb55b92079d':
  Fix onPrepareActionMode() not being called

Change-Id: Ic6f51f65f9d82b490ef26c89725b228f0568bdd9
This commit is contained in:
Chris Banes
2016-04-26 19:26:57 +00:00
committed by android-build-merger
parent d4bc15b66b 94121762ff
commit 6ade4d1067
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/WindowDecorActionBar.java
View File

@@ -505,6 +505,9 @@ public class WindowDecorActionBar extends ActionBar implements
mContextView.killMode(); mContextView.killMode();
ActionModeImpl mode = new ActionModeImpl(mContextView.getContext(), callback); ActionModeImpl mode = new ActionModeImpl(mContextView.getContext(), callback);
if (mode.dispatchOnCreate()) { if (mode.dispatchOnCreate()) {
// This needs to be set before invalidate() so that it calls
// onPrepareActionMode()
mActionMode = mode;
mode.invalidate(); mode.invalidate();
mContextView.initForMode(mode); mContextView.initForMode(mode);
animateToMode(true); animateToMode(true);
@@ -518,7 +521,6 @@ public class WindowDecorActionBar extends ActionBar implements
} }
} }
mContextView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); mContextView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
mActionMode = mode;
return mode; return mode;
} }
return null; return null;