From a716331fadca2ad447eb6dfca893845df07765c7 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 4 Dec 2013 21:20:19 -0800
Subject: [PATCH] Bug 942680 - Place search pane below actionbar. r=lucasr

---
 mobile/android/base/resources/layout/gecko_app.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index e8d07d1b6370..6569e528b95f 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -58,7 +58,7 @@
         <FrameLayout android:id="@+id/search_container"
                      android:layout_width="fill_parent"
                      android:layout_height="fill_parent"
-                     android:layout_below="@+id/browser_toolbar"
+                     android:layout_below="@+id/browser_actionbar"
                      android:background="@android:color/white"
                      android:visibility="invisible"/>
 
@@ -68,14 +68,14 @@
              the root view, BrowserToolbar should be specified as low in the
              view hierarchy as possible. -->
 
-        <ViewFlipper android:id="@+id/browser_actionbar"
+        <ViewFlipper android:id="@id/browser_actionbar"
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
                 android:clickable="true"
                 android:focusable="true">
 
             <org.mozilla.gecko.toolbar.BrowserToolbar
-                android:id="@id/browser_toolbar"
+                android:id="@+id/browser_toolbar"
                 style="@style/BrowserToolbar"
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/browser_toolbar_height"