UI work on CombinedBookmarksHistory

  Adjust the CombinedBookmarksHistory activity to leave TabBar and UrlBar visible
  Enable clicks on the top bars to propagate back to the BrowserActivity

Change-Id: Ie6aed7dc0777d31dafc7c31807adf17a60f57767

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index f858e2e..a7957ab 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -44,6 +44,7 @@ public class TitleBarXLarge extends TitleBarBase
     private Drawable mReloadDrawable;
     private Drawable mProgressDrawable;
 
+    private View mContainer;
     private View mBackButton;
     private View mForwardButton;
     private View mStar;
@@ -68,6 +69,7 @@ public class TitleBarXLarge extends TitleBarBase
         LayoutInflater factory = LayoutInflater.from(context);
         factory.inflate(R.layout.url_bar, this);
 
+        mContainer = findViewById(R.id.taburlbar);
         mUrlView = (UrlInputView) findViewById(R.id.editurl);
         mAllButton = findViewById(R.id.all_btn);
         // TODO: Change enabled states based on whether you can go
@@ -107,6 +109,10 @@ public class TitleBarXLarge extends TitleBarBase
         }
     }
 
+    int getHeightWithoutProgress() {
+        return mContainer.getHeight();
+    }
+
     void requestUrlInputFocus() {
         mUrlView.requestFocus();
     }