commit 0f9aaebdf2b1fbf230cf497598c684d7cff66653
author John Reck <jreck@google.com> Wed May 23 14:40:19 2012 -0700
committer John Reck <jreck@google.com> Wed May 23 14:40:19 2012 -0700
tree 87f6481b05394c58d1313031a016c32d8b69f112
parent af58d393e3c62a946ffd434e857819521dc01a28

Disable fixed title bar in quick controls

 Bug: 6546959

Change-Id: I7511497869ddf7b5107d73c378b88a6363d08ce6

src/com/android/browser/TitleBar.java

diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 9b2a947..ffe5553 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -67,7 +67,7 @@
         mBaseUi = ui;
         mContentView = contentView;
         initLayout(context);
-        setFixedTitleBar(!mContext.getResources().getBoolean(R.bool.hide_title));
+        setFixedTitleBar();
     }
 
     private void initLayout(Context context) {
@@ -101,7 +101,7 @@
     @Override
     protected void onConfigurationChanged(Configuration config) {
         super.onConfigurationChanged(config);
-        setFixedTitleBar(!mContext.getResources().getBoolean(R.bool.hide_title));
+        setFixedTitleBar();
     }
 
     @Override
@@ -110,10 +110,14 @@
         if (mIsFixedTitleBar) {
             int margin = getMeasuredHeight() - calculateEmbeddedHeight();
             mBaseUi.setContentViewMarginTop(-margin);
+        } else {
+            mBaseUi.setContentViewMarginTop(0);
         }
     }
 
-    private void setFixedTitleBar(boolean isFixed) {
+    private void setFixedTitleBar() {
+        boolean isFixed = !mUseQuickControls
+                && !mContext.getResources().getBoolean(R.bool.hide_title);
         // If getParent() returns null, we are initializing
         ViewGroup parent = (ViewGroup)getParent();
         if (mIsFixedTitleBar == isFixed && parent != null) return;
@@ -142,6 +146,7 @@
 
     public void setUseQuickControls(boolean use) {
         mUseQuickControls = use;
+        setFixedTitleBar();
         if (use) {
             this.setVisibility(View.GONE);
         } else {