Bug 869411 - Part 1: Move toolbar to gecko_app layout. r=sriram

mobile/android/base/BrowserApp.java

@@ -351,8 +351,7 @@ abstract public class BrowserApp extends GeckoApp
 
         super.onCreate(savedInstanceState);
 
-        RelativeLayout actionBar = (RelativeLayout) getActionBarLayout();
-        mMainLayout.addView(actionBar, 2);
+        RelativeLayout actionBar = (RelativeLayout) findViewById(R.id.browser_toolbar);
 
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideTabsTouchListener());
         ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() {
@@ -819,13 +818,6 @@ abstract public class BrowserApp extends GeckoApp
         super.onActivityResult(requestCode, resultCode, data);
     }
 
-    public View getActionBarLayout() {
-        RelativeLayout actionBar = (RelativeLayout) LayoutInflater.from(this).inflate(R.layout.browser_toolbar, null);
-        actionBar.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.FILL_PARENT,
-                                                                  (int) getResources().getDimension(R.dimen.browser_toolbar_height)));
-        return actionBar;
-    }
-
     @Override
     public boolean hasTabsSideBar() {
         return (mTabsPanel != null && mTabsPanel.isSideBar());

mobile/android/base/resources/layout/gecko_app.xml

@@ -19,8 +19,6 @@
          android:layout_height="fill_parent"
          android:background="@android:color/transparent">
 
-        <!-- BrowserToolbar will be added dynamically -->
-
         <RelativeLayout android:id="@+id/gecko_layout"
                         android:layout_width="fill_parent"
                         android:layout_height="fill_parent"
@@ -37,6 +35,9 @@
                                          style="@style/FindBar"
                                          android:visibility="gone"/>
 
+        <include layout="@layout/browser_toolbar"
+                 android:layout_width="fill_parent"
+                 android:layout_height="@dimen/browser_toolbar_height"/>
     </view>
 
 </RelativeLayout>