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

am 9512d6aa: Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb

Browse Source 
* commit '9512d6aa206f8bb44ab52b6dfe5ee8cb5c2960ea':
  Fix bug 3360954 - Text overlaid on menu icons
This commit is contained in:
Adam Powell
2011-01-17 12:10:53 -08:00
committed by Android Git Automerger
parent ab56c2ea67 9512d6aa20
commit dd9946e78a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import android.animation.ObjectAnimator;
import android.content.Context;
import android.content.res.TypedArray;
import android.util.AttributeSet;
import android.util.Log;
import android.view.ActionMode;
import android.view.LayoutInflater;
import android.view.View;
@@ -39,6 +38,8 @@ import android.widget.TextView;
* @hide
*/
public class ActionBarContextView extends ViewGroup implements AnimatorListener {
private static final String TAG = "ActionBarContextView";
private int mContentHeight;
private CharSequence mTitle;
@@ -447,7 +448,7 @@ public class ActionBarContextView extends ViewGroup implements AnimatorListener
@Override
public void onAnimationEnd(Animator animation) {
if (mAnimationMode == ANIMATE_OUT) {
if (mAnimationMode != ANIMATE_IN) {
killMode();
}
mAnimationMode = ANIMATE_IDLE;