Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java

Issue 377083002: Update menu look and feel on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased and removed binary pngs Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java
index 37f6f97f54f32eb4b2390c63d5c0c78749d942ff..d31dcf4bb0c4013e64a052da29bc36a6d255d92f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java
@@ -100,7 +100,7 @@ class AppMenuAdapter extends BaseAdapter {
StandardMenuItemViewHolder holder = null;
if (convertView == null) {
holder = new StandardMenuItemViewHolder();
- convertView = mInflater.inflate(R.layout.menu_item, null);
+ convertView = mInflater.inflate(R.layout.menu_item, parent, false);
holder.text = (TextView) convertView.findViewById(R.id.menu_item_text);
holder.image = (AppMenuItemIcon) convertView.findViewById(R.id.menu_item_icon);
convertView.setTag(holder);
@@ -132,7 +132,7 @@ class AppMenuAdapter extends BaseAdapter {
ThreeButtonMenuItemViewHolder holder = null;
if (convertView == null) {
holder = new ThreeButtonMenuItemViewHolder();
- convertView = mInflater.inflate(R.layout.three_button_menu_item, null);
+ convertView = mInflater.inflate(R.layout.three_button_menu_item, parent, false);
holder.buttonOne = (ImageButton) convertView.findViewById(R.id.button_one);
holder.buttonTwo = (ImageButton) convertView.findViewById(R.id.button_two);
holder.buttonThree = (ImageButton) convertView.findViewById(R.id.button_three);
@@ -151,7 +151,7 @@ class AppMenuAdapter extends BaseAdapter {
FourButtonMenuItemViewHolder holder = null;
if (convertView == null) {
holder = new FourButtonMenuItemViewHolder();
- convertView = mInflater.inflate(R.layout.four_button_menu_item, null);
+ convertView = mInflater.inflate(R.layout.four_button_menu_item, parent, false);
holder.buttonOne = (ImageButton) convertView.findViewById(R.id.button_one);
holder.buttonTwo = (ImageButton) convertView.findViewById(R.id.button_two);
holder.buttonThree = (ImageButton) convertView.findViewById(R.id.button_three);
@@ -172,9 +172,8 @@ class AppMenuAdapter extends BaseAdapter {
TitleButtonMenuItemViewHolder holder = null;
if (convertView == null) {
holder = new TitleButtonMenuItemViewHolder();
- convertView = mInflater.inflate(R.layout.title_button_menu_item, null);
+ convertView = mInflater.inflate(R.layout.title_button_menu_item, parent, false);
holder.title = (TextView) convertView.findViewById(R.id.title);
- holder.divider = convertView.findViewById(R.id.divider);
holder.button = (ImageButton) convertView.findViewById(R.id.button);
convertView.setTag(holder);
} else {
@@ -192,11 +191,9 @@ class AppMenuAdapter extends BaseAdapter {
});
if (item.getSubMenu().getItem(1).getIcon() != null) {
holder.button.setVisibility(View.VISIBLE);
- holder.divider.setVisibility(View.VISIBLE);
setupImageButton(holder.button, item.getSubMenu().getItem(1));
} else {
holder.button.setVisibility(View.GONE);
- holder.divider.setVisibility(View.GONE);
}
convertView.setFocusable(false);
convertView.setEnabled(false);
@@ -245,7 +242,6 @@ class AppMenuAdapter extends BaseAdapter {
static class TitleButtonMenuItemViewHolder {
public TextView title;
- public View divider;
public ImageButton button;
}
}

Powered by Google App Engine
This is Rietveld 408576698