summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTarun Nainani <tnainani@codeaurora.org>2015-03-31 14:13:49 -0700
committerWebTech Code Review <code-review@localhost>2015-03-31 21:22:52 -0700
commit9d0f54bec05e0f3484f2d84ac4fbf65d06a0ac27 (patch)
treea3c261bc2597b03c51f428cd5f88c3fc0830d4b4 /src
parentdb490c1f9ac7956ca9581e59f19af0012f8ba594 (diff)
downloadandroid_packages_apps_Gello-9d0f54bec05e0f3484f2d84ac4fbf65d06a0ac27.tar.gz
android_packages_apps_Gello-9d0f54bec05e0f3484f2d84ac4fbf65d06a0ac27.tar.bz2
android_packages_apps_Gello-9d0f54bec05e0f3484f2d84ac4fbf65d06a0ac27.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/appmenu/AppMenuAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/appmenu/AppMenuAdapter.java b/src/com/android/browser/appmenu/AppMenuAdapter.java
index 425e91c9..b0e69429 100644
--- a/src/com/android/browser/appmenu/AppMenuAdapter.java
+++ b/src/com/android/browser/appmenu/AppMenuAdapter.java
@@ -158,7 +158,7 @@ class AppMenuAdapter extends BaseAdapter {
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);