diff options
| author | George Mount <mount@google.com> | 2012-04-19 14:41:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 14:41:03 -0700 |
| commit | cdfc8bc57462ed3e074b328a7450c6450202cdaa (patch) | |
| tree | 6fa0b78e273e8a41d69920f170c080096615cc7e | |
| parent | a131f4efee2b5a79082ed6ee30fbb8e0e3f05413 (diff) | |
| parent | 9caeb145721238897809805f521bb5c8ef375c0f (diff) | |
| download | frameworks_base-cdfc8bc57462ed3e074b328a7450c6450202cdaa.zip frameworks_base-cdfc8bc57462ed3e074b328a7450c6450202cdaa.tar.gz frameworks_base-cdfc8bc57462ed3e074b328a7450c6450202cdaa.tar.bz2 | |
Merge "Fix stack overflow during animation of action bar."
| -rw-r--r-- | core/java/com/android/internal/widget/AbsActionBarView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/com/android/internal/widget/AbsActionBarView.java b/core/java/com/android/internal/widget/AbsActionBarView.java index 06f5158..25a9c54 100644 --- a/core/java/com/android/internal/widget/AbsActionBarView.java +++ b/core/java/com/android/internal/widget/AbsActionBarView.java @@ -161,10 +161,12 @@ public abstract class AbsActionBarView extends ViewGroup { @Override public void setVisibility(int visibility) { - if (mVisibilityAnim != null) { - mVisibilityAnim.end(); + if (visibility != getVisibility()) { + if (mVisibilityAnim != null) { + mVisibilityAnim.end(); + } + super.setVisibility(visibility); } - super.setVisibility(visibility); } public boolean showOverflowMenu() { |