Merge "Fix stack overflow during animation of action bar."

George Mount · Android (Google) Code Review · commit cdfc8bc57462 · 2012-04-19T14:41:03.000-07:00
diff --git a/core/java/com/android/internal/widget/AbsActionBarView.java b/core/java/com/android/internal/widget/AbsActionBarView.java
@@ -161,10 +161,12 @@ public void animateToVisibility(int visibility) {
 
     @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() {

Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,12 @@ public void animateToVisibility(int visibility) {`
`161`	`161`
`162`	`162`	`@Override`
`163`	`163`	`public void setVisibility(int visibility) {`
`164`		`- if (mVisibilityAnim != null) {`
`165`		`- mVisibilityAnim.end();`
	`164`	`+ if (visibility != getVisibility()) {`
	`165`	`+ if (mVisibilityAnim != null) {`
	`166`	`+ mVisibilityAnim.end();`
	`167`	`+ }`
	`168`	`+ super.setVisibility(visibility);`
`166`	`169`	`}`
`167`		`- super.setVisibility(visibility);`
`168`	`170`	`}`
`169`	`171`
`170`	`172`	`public boolean showOverflowMenu() {`