commit 47171d85e40b3d89e347f950d157036f6b0c1d8d
author Michael Kolb <kolby@google.com> Fri Jan 28 10:34:15 2011 -0800
committer Michael Kolb <kolby@google.com> Fri Jan 28 13:22:04 2011 -0800
tree ea6a24aeb820066851af2be7edba522a5057c912
parent ba58657f269b289186764c5b9ba4bd42318033d8

fix focus handling in url input

    http://b/issue?id=3373046
    removed focus updates from focus listener

Change-Id: I48fdb39053dce7546038022f7aee671fe97047df

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 2aaa029..0fa38cf 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -304,7 +304,7 @@
     @Override
     protected void hideFakeTitleBar() {
         if (isFakeTitleBarShowing()) {
-            mFakeTitleBar.setUrlMode(false);
+            mFakeTitleBar.setEditMode(false);
             mContentView.removeView(mFakeTitleBar);
             mTabBar.onHideTitleBar();
         }
@@ -417,7 +417,8 @@
                     return true;
                 }
         }
-        if (event.isPrintingKey() && !mFakeTitleBar.isEditingUrl()) {
+        boolean ctrl = event.hasModifiers(KeyEvent.META_CTRL_ON);
+        if (!ctrl && event.isPrintingKey() && !mFakeTitleBar.isEditingUrl()) {
             editUrl(true);
             return mContentView.dispatchKeyEvent(event);
         }