diff options
| author | Michael Kolb <kolby@google.com> | 2011-01-13 20:35:06 -0800 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2011-01-20 11:33:56 -0800 |
| commit | 5a72f1858c2f73be3558c6cdaa2c84b4c36fa748 (patch) | |
| tree | 4d27e2f21e1c080baaf07298deb8729dda61a6f7 /src/com/android/browser/TabBar.java | |
| parent | 91c83a0ffb0d33a614fefa6ee81ead47ec0d114b (diff) | |
| download | packages_apps_browser-5a72f1858c2f73be3558c6cdaa2c84b4c36fa748.zip packages_apps_browser-5a72f1858c2f73be3558c6cdaa2c84b4c36fa748.tar.gz packages_apps_browser-5a72f1858c2f73be3558c6cdaa2c84b4c36fa748.tar.bz2 | |
asset drop & naming
drop in new assets
get naming in sync with UX
Note: not all resources are included yet
item_background...xm will be enabled when all required resources come in
Change-Id: I321084abd25ef6c533f1f3da636a246e7ee00547
Diffstat (limited to 'src/com/android/browser/TabBar.java')
| -rw-r--r-- | src/com/android/browser/TabBar.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java index b872cad..b0057ed 100644 --- a/src/com/android/browser/TabBar.java +++ b/src/com/android/browser/TabBar.java @@ -91,6 +91,7 @@ public class TabBar extends LinearLayout private BitmapShader mInactiveShader; private int mTabOverlap; + private int mAddTabOverlap; private int mTabSliceWidth; private int mTabPadding; private boolean mUseQuickControls; @@ -123,6 +124,7 @@ public class TabBar extends LinearLayout mButtonWidth = -1; // tab dimensions mTabOverlap = (int) res.getDimension(R.dimen.tab_overlap); + mAddTabOverlap = (int) res.getDimension(R.dimen.tab_addoverlap); mTabSliceWidth = (int) res.getDimension(R.dimen.tab_slice); mTabPadding = (int) res.getDimension(R.dimen.tab_padding); @@ -159,7 +161,7 @@ public class TabBar extends LinearLayout int w = getMeasuredWidth(); // adjust for new tab overlap if (!mUseQuickControls) { - w -= mTabOverlap; + w -= mAddTabOverlap; } setMeasuredDimension(w, getMeasuredHeight()); } @@ -174,7 +176,7 @@ public class TabBar extends LinearLayout if (mUseQuickControls) { mButtonWidth = 0; } else { - mButtonWidth = mNewTab.getMeasuredWidth() - mTabOverlap; + mButtonWidth = mNewTab.getMeasuredWidth() - mAddTabOverlap; if (w-sw < mButtonWidth) { sw = w - mButtonWidth; } @@ -182,8 +184,8 @@ public class TabBar extends LinearLayout mTabs.layout(pl, pt, pl + sw, bottom - top); // adjust for overlap if (!mUseQuickControls) { - mNewTab.layout(pl + sw - mTabOverlap, pt, - pl + sw + mButtonWidth - mTabOverlap, bottom - top); + mNewTab.layout(pl + sw - mAddTabOverlap, pt, + pl + sw + mButtonWidth - mAddTabOverlap, bottom - top); } } |