drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing

Browse Source 
Change-Id: I9e7ec4ab14c6008397d26c499ccf478f8875f918
This commit is contained in:
Adam Powell
2011-01-18 16:51:22 -08:00
parent 11ebdd6a79
commit a1e6358a4c
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/app/ActionBarImpl.java
View File

@ -388,6 +388,7 @@ public class ActionBarImpl extends ActionBar {
mActionMode.finish();
}
mUpperContextView.killMode();
ActionMode mode = new ActionModeImpl(callback);
if (callback.onCreateActionMode(mode, mode.getMenu())) {
mode.invalidate();

10
core/java/com/android/internal/widget/ActionBarContextView.java
View File

@ -160,10 +160,6 @@ public class ActionBarContextView extends ViewGroup implements AnimatorListener
}
public void initForMode(final ActionMode mode) {
if (mAnimationMode != ANIMATE_IDLE || mAnimateInOnLayout) {
killMode();
}
if (mClose == null) {
LayoutInflater inflater = LayoutInflater.from(mContext);
mClose = inflater.inflate(R.layout.action_mode_close_item, this, false);
@ -198,15 +194,15 @@ public class ActionBarContextView extends ViewGroup implements AnimatorListener
return;
}
mAnimationMode = ANIMATE_OUT;
finishAnimation();
mAnimationMode = ANIMATE_OUT;
mCurrentAnimation = makeOutAnimation();
mCurrentAnimation.start();
}
private void finishAnimation() {
final Animator a = mCurrentAnimation;
if (a != null && a.isRunning()) {
if (a != null) {
mCurrentAnimation = null;
a.end();
}
@ -448,7 +444,7 @@ public class ActionBarContextView extends ViewGroup implements AnimatorListener
@Override
public void onAnimationEnd(Animator animation) {
if (mAnimationMode != ANIMATE_IN) {
if (mAnimationMode == ANIMATE_OUT) {
killMode();
}
mAnimationMode = ANIMATE_IDLE;

1
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@ -1983,6 +1983,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
if (mActionModeView != null) {
mActionModeView.killMode();
mode = new StandaloneActionMode(getContext(), mActionModeView, wrappedCallback);
if (callback.onCreateActionMode(mode, mode.getMenu())) {
mode.invalidate();