commit 5a72f1858c2f73be3558c6cdaa2c84b4c36fa748
author Michael Kolb <kolby@google.com> Thu Jan 13 20:35:06 2011 -0800
committer Michael Kolb <kolby@google.com> Thu Jan 20 11:33:56 2011 -0800
tree 4d27e2f21e1c080baaf07298deb8729dda61a6f7
parent 91c83a0ffb0d33a614fefa6ee81ead47ec0d114b

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

src/com/android/browser/TabBar.java

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 @@
     private BitmapShader mInactiveShader;
 
     private int mTabOverlap;
+    private int mAddTabOverlap;
     private int mTabSliceWidth;
     private int mTabPadding;
     private boolean mUseQuickControls;
@@ -123,6 +124,7 @@
         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 @@
         int w = getMeasuredWidth();
         // adjust for new tab overlap
         if (!mUseQuickControls) {
-            w -= mTabOverlap;
+            w -= mAddTabOverlap;
         }
         setMeasuredDimension(w, getMeasuredHeight());
     }
@@ -174,7 +176,7 @@
         if (mUseQuickControls) {
             mButtonWidth = 0;
         } else {
-            mButtonWidth = mNewTab.getMeasuredWidth() - mTabOverlap;
+            mButtonWidth = mNewTab.getMeasuredWidth() - mAddTabOverlap;
             if (w-sw < mButtonWidth) {
                 sw = w - mButtonWidth;
             }
@@ -182,8 +184,8 @@
         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);
         }
     }