Fix stack overflow during animation of action bar.

George Mount · George Mount · commit 9caeb1457212 · 2012-04-19T14:38:58.000-07:00
Bug 6366482
 The animation engine now notifies onAnimationStart() and
 onAnimationEnd() even when it does no action. This CL prevents
 the setVisiblity call from causing an infinite loop of triggering
 animation notifications.

Change-Id: I009217a42debf1a1495da222199ca8f599fa7bcf
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() {`