From f8963521024f39236388eb8e70835f813bf7f4ee Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Tue, 10 Apr 2012 10:52:34 -0700
Subject: De-focus url input before tab data change

  Bug: 6315452

Change-Id: I1540122a7dd31fc2cf477b4f70ff88cdbcecc56e
---
 src/com/android/browser/BaseUi.java   | 1 +
 src/com/android/browser/PhoneUi.java  | 1 -
 src/com/android/browser/XLargeUi.java | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index f8a9414..9aaceeb 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -251,6 +251,7 @@ public abstract class BaseUi implements UI {
         updateUrlBarAutoShowManagerTarget();
         attachTabToContentView(tab);
         mTitleBar.bringToFront();
+        tab.getTopWindow().requestFocus();
         setShouldShowErrorConsole(tab, mUiController.shouldShowErrorConsole());
         onTabDataChanged(tab);
         onProgressChanged(tab);
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index d02a3d2..a1f70da 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -178,7 +178,6 @@ public class PhoneUi extends BaseUi {
         // update nav bar state
         mNavigationBar.onStateChanged(StateListener.STATE_NORMAL);
         updateLockIconToLatest(tab);
-        tab.getTopWindow().requestFocus();
         mTitleBar.setSkipTitleBarAnimations(false);
     }
 
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 6e37c15..b372fab 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -193,7 +193,6 @@ public class XLargeUi extends BaseUi {
             revertVoiceTitleBar(tab);
         }
         updateLockIconToLatest(tab);
-        tab.getTopWindow().requestFocus();
         mTitleBar.setSkipTitleBarAnimations(false);
     }
 
-- 
cgit v1.1