commit 9d0f54bec05e0f3484f2d84ac4fbf65d06a0ac27
author Tarun Nainani <tnainani@codeaurora.org> Tue Mar 31 14:13:49 2015 -0700
committer WebTech Code Review <code-review@localhost> Tue Mar 31 21:22:52 2015 -0700
tree a3c261bc2597b03c51f428cd5f88c3fc0830d4b4
parent db490c1f9ac7956ca9581e59f19af0012f8ba594

Fix Browser main menu crash.

Chrome Shell and SWE browser resource had same layout 'menu_item'
causing issues with certain build enviroment overlaying SWE browser
resource with Chrome Shell. Renamed SWE browser layout to avoid
one getting overlayed with another.

Change-Id: I8c4111c2bd2de046a67644293c82b5b7cfdda60f

res/layout/swe_menu_item.xml

diff --git a/res/layout/menu_item.xml b/res/layout/swe_menu_item.xml
similarity index 100%
rename from res/layout/menu_item.xml
rename to res/layout/swe_menu_item.xml

src/com/android/browser/appmenu/AppMenuAdapter.java

diff --git a/src/com/android/browser/appmenu/AppMenuAdapter.java b/src/com/android/browser/appmenu/AppMenuAdapter.java
index 425e91c..b0e6942 100644
--- a/src/com/android/browser/appmenu/AppMenuAdapter.java
+++ b/src/com/android/browser/appmenu/AppMenuAdapter.java
@@ -158,7 +158,7 @@
                 StandardMenuItemViewHolder holder = null;
                 if (convertView == null) {
                     holder = new StandardMenuItemViewHolder();
-                    convertView = mInflater.inflate(R.layout.menu_item, parent, false);
+                    convertView = mInflater.inflate(R.layout.swe_menu_item, parent, false);
                     holder.text = (TextView) convertView.findViewById(R.id.menu_item_text);
                     holder.image = (AppMenuItemIcon) convertView.findViewById(R.id.menu_item_icon);
                     holder.checkbox = (CheckBox) convertView.findViewById(R.id.menu_item_checkbox);