From aa5a9bb687136dd448b72c591c089ae7276f993a Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 24 Apr 2013 21:19:26 +0100
Subject: [PATCH] Bug 858687 - Rename browser_toolbar_menu.xml to
 browser_toolbar.xml (r=mfinkle)

--HG--
rename : mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml => mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
rename : mobile/android/base/resources/layout/browser_toolbar_menu.xml => mobile/android/base/resources/layout/browser_toolbar.xml
---
 mobile/android/base/BrowserApp.java                           | 2 +-
 mobile/android/base/Makefile.in                               | 4 ++--
 .../{browser_toolbar_menu.xml => browser_toolbar.xml}         | 0
 .../layout/{browser_toolbar_menu.xml => browser_toolbar.xml}  | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename mobile/android/base/resources/layout-large-v11/{browser_toolbar_menu.xml => browser_toolbar.xml} (100%)
 rename mobile/android/base/resources/layout/{browser_toolbar_menu.xml => browser_toolbar.xml} (100%)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index c9025df7ea00..5025291f23ca 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -683,7 +683,7 @@ abstract public class BrowserApp extends GeckoApp
     }
 
     public View getActionBarLayout() {
-        RelativeLayout actionBar = (RelativeLayout) LayoutInflater.from(this).inflate(R.layout.browser_toolbar_menu, null);
+        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;
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 8e9d09a29c81..251812379a11 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -401,7 +401,7 @@ RES_LAYOUT = \
   res/layout/awesomebar_tab_indicator.xml \
   res/layout/awesomebar_tabs.xml \
   res/layout/bookmark_edit.xml \
-  res/layout/browser_toolbar_menu.xml \
+  res/layout/browser_toolbar.xml \
   res/layout/datetime_picker.xml \
   res/layout/doorhangerpopup.xml \
   res/layout/doorhanger.xml \
@@ -448,7 +448,7 @@ RES_LAYOUT = \
 
 RES_LAYOUT_LARGE_V11 = \
   res/layout-large-v11/awesomebar_search.xml \
-  res/layout-large-v11/browser_toolbar_menu.xml \
+  res/layout-large-v11/browser_toolbar.xml \
   $(NULL)
 
 RES_LAYOUT_LARGE_LAND_V11 = \
diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
similarity index 100%
rename from mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml
rename to mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
diff --git a/mobile/android/base/resources/layout/browser_toolbar_menu.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
similarity index 100%
rename from mobile/android/base/resources/layout/browser_toolbar_menu.xml
rename to mobile/android/base/resources/layout/browser_toolbar.xml