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

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

Browse Source
This commit is contained in:
Jim Miller
2010-03-29 15:07:06 -07:00
committed by Android (Google) Code Review
parent 89d4e2dd78 966a8c7859
commit c6dc5070ef
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/widget/SlidingTab.java
View File

@@ -476,7 +476,9 @@ public class SlidingTab extends ViewGroup {
int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec); int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
if (widthSpecMode == MeasureSpec.UNSPECIFIED || heightSpecMode == MeasureSpec.UNSPECIFIED) { 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(); mLeftSlider.measure();
@@ -554,6 +556,9 @@ public class SlidingTab extends ViewGroup {
public void reset(boolean animate) { public void reset(boolean animate) {
mLeftSlider.reset(animate); mLeftSlider.reset(animate);
mRightSlider.reset(animate); mRightSlider.reset(animate);
if (!animate) {
mAnimating = false;
}
} }
@Override @Override