commit f389da90dfc28064b63d40bbb3091f102ca5f44d
author Leon Scroggins <scroggo@google.com> Thu Apr 15 08:10:25 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 15 08:10:25 2010 -0700
tree df3093b26c2cf71d2880d7584f467427b19c023a
parent 965a65f43b8528e11df56366541f57de603a0c7d
parent 7fb1a353c94736dfcde690d8379e3bfd853362dd

Merge "Use the green box's padding, and not the TitleBar's padding." into froyo

src/com/android/browser/TitleBar.java

diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index fc39f36..dc4979b 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -281,8 +281,8 @@
             mRtButton.setVisibility(View.VISIBLE);
             mStopButton.setVisibility(View.GONE);
             mTitleBg.setBackgroundDrawable(titleDrawable);
-            mTitleBg.setPadding(mLeftMargin, getPaddingTop(), mRightMargin,
-                    getPaddingBottom());
+            mTitleBg.setPadding(mLeftMargin, mTitleBg.getPaddingTop(),
+                    mRightMargin, mTitleBg.getPaddingBottom());
         } else {
             if (mInLoad) {
                 titleDrawable = mLoadingBackground;