Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java |
| index ef2f4045d44f2e15830f6edfdb156473718425eb..1020a957f436970548f2a5a14079d1558801925e 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java |
| @@ -12,6 +12,7 @@ import android.view.View; |
| import android.view.ViewGroup; |
| import android.widget.BaseAdapter; |
| import android.widget.ImageView; |
| +import android.widget.LinearLayout; |
| import android.widget.TextView; |
| import org.chromium.chrome.R; |
| @@ -24,9 +25,11 @@ import java.util.List; |
| * list view. |
| */ |
| class TabularContextMenuListAdapter extends BaseAdapter { |
| + private static final int PADDING_DP = 15; |
| private final List<ContextMenuItem> mMenuItems; |
| private final Activity mActivity; |
| private final Runnable mOnShareItemClicked; |
| + private final int mPadding; |
| /** |
| * Adapter for the tabular context menu UI |
| @@ -38,6 +41,8 @@ class TabularContextMenuListAdapter extends BaseAdapter { |
| mMenuItems = menuItems; |
| mActivity = activity; |
| mOnShareItemClicked = onShareItemClicked; |
| + float dpToPx = activity.getResources().getDisplayMetrics().density; |
| + mPadding = (int) (PADDING_DP * dpToPx); |
|
Ted C
2017/05/02 16:51:37
ah, so this is how you are going about the conditi
ltian
2017/05/02 18:52:28
Done.
|
| } |
| @Override |
| @@ -79,11 +84,13 @@ class TabularContextMenuListAdapter extends BaseAdapter { |
| Drawable icon = menuItem.getDrawableAndDescription(mActivity); |
| viewHolder.mIcon.setImageDrawable(icon); |
| viewHolder.mIcon.setVisibility(icon != null ? View.VISIBLE : View.INVISIBLE); |
| + viewHolder.mRowLayout = (LinearLayout) convertView.findViewById(R.id.context_menu_row); |
| if (menuItem == ContextMenuItem.SHARE_IMAGE) { |
| final Pair<Drawable, CharSequence> shareInfo = |
| ShareHelper.getShareableIconAndName(mActivity); |
| if (shareInfo.first != null) { |
| + viewHolder.mRowLayout.setPadding(mPadding, 0, 0, 0); |
| viewHolder.mShareIcon.setImageDrawable(shareInfo.first); |
| viewHolder.mShareIcon.setVisibility(View.VISIBLE); |
| viewHolder.mShareIcon.setContentDescription(mActivity.getString( |
| @@ -94,9 +101,12 @@ class TabularContextMenuListAdapter extends BaseAdapter { |
| mOnShareItemClicked.run(); |
| } |
| }); |
| + } else { |
| + viewHolder.mRowLayout.setPadding(mPadding, 0, mPadding, 0); |
| } |
| } else { |
| viewHolder.mShareIcon.setVisibility(View.GONE); |
| + viewHolder.mRowLayout.setPadding(mPadding, 0, mPadding, 0); |
| } |
| return convertView; |
| @@ -106,5 +116,6 @@ class TabularContextMenuListAdapter extends BaseAdapter { |
| ImageView mIcon; |
| TextView mText; |
| ImageView mShareIcon; |
| + LinearLayout mRowLayout; |
| } |
| } |