commit 8a66078a13cf74fe6b44380b4ee6d28426776a3f
author Vivek Sekhar <vsekhar@codeaurora.org> Mon Oct 27 17:00:53 2014 -0700
committer WebTech Code Review <code-review@localhost> Thu Oct 30 08:09:10 2014 -0700
tree 04c50425637d2a058a7e9831bc07fcb01dfc05e1
parent 0e10a20dff43af1c6111b8df606d1a83b51d51d2

Fixes to title bar using top controls

- Do not differentiate between title bar in fixed vs auto-hide mode
  using different android layouts. Use top controls to always show
  titlebar for fixed titlebar.
- Always show the titlebar when page is being loaded even if the user
  scrolls during the page load.
- Fixes the jankiness seen in fixed titlebar mode when user navigates
  between webpages.
- Reaffirm top controls when user switches between fixed and auto-hide
  titlebar mode.

Change-Id: I2531695f34e725ae444f6159645c7557dec69fab

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index fbb5ad0..1ea1460 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -819,8 +819,8 @@
             } else {
                 mTitleBar.setEnabled(true);
             }
-
-            mTitleBar.setTranslationY(topControlsOffsetYPix);
+            if (!mTitleBar.isFixed() && !isLoading())
+                mTitleBar.setTranslationY(topControlsOffsetYPix);
         }
     }
 
@@ -898,10 +898,6 @@
 
     }
 
-    public void addFixedTitleBar(View view) {
-        mFixedTitlebarContainer.addView(view);
-    }
-
     public void setContentViewMarginTop(int margin) {
         LinearLayout.LayoutParams params =
                 (LinearLayout.LayoutParams) mContentView.getLayoutParams();

src/com/android/browser/TitleBar.java

diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 1ea4dad..5d5f1e3 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -102,13 +102,7 @@
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if (mIsFixedTitleBar) {
-            int margin = getMeasuredHeight() - calculateEmbeddedHeight();
-            if (!isEditingUrl())
-                mBaseUi.setContentViewMarginTop(-margin);
-        } else {
-            mBaseUi.setContentViewMarginTop(0);
-        }
+        mBaseUi.setContentViewMarginTop(0);
     }
 
     private void setFixedTitleBar() {
@@ -125,12 +119,8 @@
         if (parent != null) {
             parent.removeView(this);
         }
-        if (mIsFixedTitleBar) {
-            mBaseUi.addFixedTitleBar(this);
-        } else {
-            mContentView.addView(this, makeLayoutParams());
-            mBaseUi.setContentViewMarginTop(0);
-        }
+        mContentView.addView(this, makeLayoutParams());
+        mBaseUi.setContentViewMarginTop(0);
     }
 
     public BaseUi getUi() {
@@ -168,7 +158,11 @@
         if (mSkipTitleBarAnimations) {
             this.setVisibility(View.VISIBLE);
             this.setTranslationY(0);
-            hideTopControls();
+            // reaffirm top-controls
+            if (isFixed() || isInLoad())
+                showTopControls();
+            else
+                enableTopControls();
         } else if (!bOldStyleAutoHideDisabled) {
             int visibleHeight = getVisibleTitleHeight();
             float startPos = (-getEmbeddedHeight() + visibleHeight);
@@ -283,7 +277,10 @@
             }
 
             //onPageFinished
-            enableTopControls();
+            if (isFixed())
+                showTopControls();
+            else
+                enableTopControls();
 
         } else {
             if (!mInLoad) {