From 8819c2b7f69ecb35c44aa92c67756449f8d3755d Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Fri, 18 Oct 2013 09:42:51 -0700
Subject: [PATCH] Bug 924480 - Part 1: Make search_container focusable before
 browser_toolbar. r=bnicholson

---
 mobile/android/base/BrowserToolbar.java       |  1 +
 .../base/resources/layout/gecko_app.xml       | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index 565417a308cd..849ba125d4b6 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -387,6 +387,7 @@ public class BrowserToolbar extends GeckoRelativeLayout
                 }
 
                 if (keyCode == KeyEvent.KEYCODE_BACK) {
+                    // Drop the virtual keyboard.
                     clearFocus();
                     return true;
                 }
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index 8d3407933c2a..6b9ca9d8df26 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -55,20 +55,25 @@
                         android:layout_alignParentBottom="true">
         </RelativeLayout>
 
-        <org.mozilla.gecko.BrowserToolbar android:id="@+id/browser_toolbar"
+        <FrameLayout android:id="@+id/search_container"
+                     android:layout_width="fill_parent"
+                     android:layout_height="fill_parent"
+                     android:layout_below="@+id/browser_toolbar"
+                     android:background="@android:color/white"
+                     android:visibility="invisible"/>
+
+        <!-- When focus is cleared from from BrowserToolbar's EditText to
+             lower the virtual keyboard, focus will be returned to the root
+             view. To make sure the EditText is not the first focusable view in
+             the root view, BrowserToolbar should be specified as low in the
+             view hierarchy as possible. -->
+        <org.mozilla.gecko.BrowserToolbar android:id="@id/browser_toolbar"
                 style="@style/BrowserToolbar"
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
                 android:clickable="true"
                 android:focusable="true"/>
 
-        <FrameLayout android:id="@+id/search_container"
-                     android:layout_width="fill_parent"
-                     android:layout_height="fill_parent"
-                     android:layout_below="@id/browser_toolbar"
-                     android:background="@android:color/white"
-                     android:visibility="invisible"/>
-
     </view>
 
     <LinearLayout android:id="@+id/toast"