summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-03-10 09:49:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-10 09:49:52 -0800
commit33cf94d615368aee2c0e60a2909d5bf7a8562a5d (patch)
tree21a0a505c6f827babc4eee32e0eed4fdf4ce70a2
parenta07c587cc6c6ed047d34f3edccb229e96431873e (diff)
parent7de7bfaad5420facfc481b822a5bf7120f6781ad (diff)
downloadpackages_apps_Browser-33cf94d615368aee2c0e60a2909d5bf7a8562a5d.zip
packages_apps_Browser-33cf94d615368aee2c0e60a2909d5bf7a8562a5d.tar.gz
packages_apps_Browser-33cf94d615368aee2c0e60a2909d5bf7a8562a5d.tar.bz2
am 7de7bfaa: Merge "fix url bar disappearing bug" into honeycomb-mr1
* commit '7de7bfaad5420facfc481b822a5bf7120f6781ad': fix url bar disappearing bug
-rw-r--r--src/com/android/browser/XLargeUi.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 9b5a884..0712f37 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -363,9 +363,11 @@ public class XLargeUi extends BaseUi implements ScrollListener {
if (inLoad) {
// the titlebar was removed when the CAB was shown
// if the page is loading, show it again
- mTitleBar.setShowProgressOnly(true);
- if (!isTitleBarShowing()) {
- setTitleGravity(Gravity.TOP);
+ if (mUseQuickControls) {
+ mTitleBar.setShowProgressOnly(true);
+ if (!isTitleBarShowing()) {
+ setTitleGravity(Gravity.TOP);
+ }
}
showTitleBar();
}