commit 81b6f83b7032f22fdaaa514afda2448f801b73da
author Michael Kolb <kolby@google.com> Sun Dec 12 12:44:27 2010 -0800
committer Michael Kolb <kolby@google.com> Mon Dec 13 09:30:22 2010 -0800
tree f2cda854982c2ebc4847bebc65868de717b94a6f
parent d7d26819d01abc200dd569589579660435def146

fix urlbar focus handling

    Bug: http://b/issue?id=3275805
    Entering url edit mode is controlled by the UI class
    Only the overlay title bar is used for editing
    Url selection action mode does not hide overlay title bar

Change-Id: Ib528c641ba6cebb3a62de498ef3974a6117369df

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 4fca79d..70813e5 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -132,9 +132,9 @@
         frameLayout.addView(mBrowserFrameLayout, COVER_SCREEN_PARAMS);
 
         if (mXLargeScreenSize) {
-            mTitleBar = new TitleBarXLarge(mActivity, mUiController);
+            mTitleBar = new TitleBarXLarge(mActivity, mUiController, this);
             mTitleBar.setProgress(100);
-            mFakeTitleBar = new TitleBarXLarge(mActivity, mUiController);
+            mFakeTitleBar = new TitleBarXLarge(mActivity, mUiController, this);
             ActionBar actionBar = mActivity.getActionBar();
             mTabBar = new TabBar(mActivity, mUiController, this);
             actionBar.setCustomNavigationMode(mTabBar);
@@ -515,6 +515,11 @@
         return 0;
     }
 
+    void editUrl(boolean clearInput) {
+        showFakeTitleBar();
+        ((TitleBarXLarge) mFakeTitleBar).onEditUrl(clearInput);
+    }
+
     void showFakeTitleBar() {
         if (!isFakeTitleBarShowing() && mActiveTabsPage == null &&
                 !mActivityPaused) {
@@ -781,8 +786,11 @@
 
     @Override
     public void onActionModeStarted(ActionMode mode) {
-        // hide the fake title bar when CAB is shown
-        hideFakeTitleBar();
+        if (!mXLargeScreenSize
+                || !((TitleBarXLarge) mFakeTitleBar).isEditingUrl()) {
+            // hide the fake title bar when CAB is shown
+            hideFakeTitleBar();
+        }
     }
 
     @Override