am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo

Merge commit 'd41d458696b2ab54387dd0683a3365e788b97c2d' into kraken

* commit 'd41d458696b2ab54387dd0683a3365e788b97c2d':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs

core/java/com/android/internal/widget/SlidingTab.java

@@ -476,7 +476,9 @@ public class SlidingTab extends ViewGroup {
         int heightSpecSize =  MeasureSpec.getSize(heightMeasureSpec);
 
         if (widthSpecMode == MeasureSpec.UNSPECIFIED || heightSpecMode == MeasureSpec.UNSPECIFIED) {
-            throw new RuntimeException(LOG_TAG + " cannot have UNSPECIFIED dimensions");
+            Log.e("SlidingTab", "SlidingTab cannot have UNSPECIFIED MeasureSpec"
+                    +"(wspec=" + widthSpecMode + ", hspec=" + heightSpecMode + ")",
+                    new RuntimeException(LOG_TAG + "stack:"));
         }
 
         mLeftSlider.measure();
@@ -554,6 +556,9 @@ public class SlidingTab extends ViewGroup {
     public void reset(boolean animate) {
         mLeftSlider.reset(animate);
         mRightSlider.reset(animate);
+        if (!animate) {
+            mAnimating = false;
+        }
     }
 
     @Override