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

am 11fea858: Merge change I8061e6ac into eclair

Browse Source 
Merge commit '11fea858b2f2d3f9c40a4da848d7bcee47edde04' into eclair-plus-aosp

* commit '11fea858b2f2d3f9c40a4da848d7bcee47edde04':
  Fix 2209086: Updated assets and fixed widget dimension calculation.
This commit is contained in:
Jim Miller
2009-11-12 19:29:22 -08:00
committed by Android Git Automerger
parent 392ae2eee9 11fea858b2
commit a488be82a1
118 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,12 +309,30 @@ public class SlidingTab extends ViewGroup {
setState(currentState);
}
public int getTabWidth() {
return tab.getDrawable().getIntrinsicWidth();
/**
* Ensure all the dependent widgets are measured.
*/
public void measure() {
tab.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
text.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
}
/**
* Get the measured tab width. Must be called after {@link Slider#measure()}.
* @return
*/
public int getTabWidth() {
return tab.getMeasuredWidth();
}
/**
* Get the measured tab width. Must be called after {@link Slider#measure()}.
* @return
*/
public int getTabHeight() {
return tab.getDrawable().getIntrinsicHeight();
return tab.getMeasuredHeight();
}
}
@@ -360,11 +378,12 @@ public class SlidingTab extends ViewGroup {
throw new RuntimeException(LOG_TAG + " cannot have UNSPECIFIED dimensions");
}
final float density = mDensity;
final int leftTabWidth = (int) (density * mLeftSlider.getTabWidth() + 0.5f);
final int rightTabWidth = (int) (density * mRightSlider.getTabWidth() + 0.5f);
final int leftTabHeight = (int) (density * mLeftSlider.getTabHeight() + 0.5f);
final int rightTabHeight = (int) (density * mRightSlider.getTabHeight() + 0.5f);
mLeftSlider.measure();
mRightSlider.measure();
final int leftTabWidth = mLeftSlider.getTabWidth();
final int rightTabWidth = mRightSlider.getTabWidth();
final int leftTabHeight = mLeftSlider.getTabHeight();
final int rightTabHeight = mRightSlider.getTabHeight();
final int width;
final int height;
if (isHorizontal()) {