summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-04-15 16:31:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-15 16:31:10 -0700
commit7b6ce527a776313f3cb4aeb7b15ace17187bdcfb (patch)
treedf3093b26c2cf71d2880d7584f467427b19c023a
parent7c27053886fae53ccb851f3f98585e7584ec36ab (diff)
parentf389da90dfc28064b63d40bbb3091f102ca5f44d (diff)
downloadpackages_apps_Browser-7b6ce527a776313f3cb4aeb7b15ace17187bdcfb.zip
packages_apps_Browser-7b6ce527a776313f3cb4aeb7b15ace17187bdcfb.tar.gz
packages_apps_Browser-7b6ce527a776313f3cb4aeb7b15ace17187bdcfb.tar.bz2
am f389da90: Merge "Use the green box\'s padding, and not the TitleBar\'s padding." into froyo
-rw-r--r--src/com/android/browser/TitleBar.java4
1 files changed, 2 insertions, 2 deletions
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 @@ public class TitleBar extends LinearLayout {
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;