Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuViewPager.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuViewPager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuViewPager.java |
| index 55a3ad51463e8baa21ae31e467cace64f72fc229..f4d4ae969aed71f62312d6d31e610c3af46c33b8 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuViewPager.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuViewPager.java |
| @@ -16,8 +16,6 @@ import org.chromium.chrome.R; |
| * pager. |
| */ |
| public class TabularContextMenuViewPager extends ViewPager { |
| - private static final double MAX_WIDTH_PROPORTION = 0.75; |
| - |
| public TabularContextMenuViewPager(Context context) { |
| super(context); |
| } |
| @@ -38,9 +36,11 @@ public class TabularContextMenuViewPager extends ViewPager { |
| // getCurrentItem() does not take into account the tab layout unlike getChildCount(). |
| int currentItemsIndex = getCurrentItem() + 1; |
|
gone
2017/06/26 21:17:29
This function needs more comments explaining what'
Daniel Park
2017/06/26 21:51:23
Done.
|
| - // TODO(injae): Fix sizing on orientation changes (crbug.com/731173) |
| - int contextMenuWidth = (int) Math.min( |
| - getResources().getDisplayMetrics().widthPixels * MAX_WIDTH_PROPORTION, |
| + int deviceWidthPx = getResources().getDisplayMetrics().widthPixels; |
| + int contextMenuSidePadding = |
| + getResources().getDimensionPixelSize(R.dimen.context_menu_min_side_padding); |
|
gone
2017/06/26 21:17:29
Because they're constants, you should cache the si
Daniel Park
2017/06/26 21:51:22
Done.
|
| + |
| + int contextMenuWidth = Math.min(deviceWidthPx - 2 * contextMenuSidePadding, |
| getResources().getDimensionPixelSize(R.dimen.context_menu_max_width)); |
| widthMeasureSpec = MeasureSpec.makeMeasureSpec(contextMenuWidth, MeasureSpec.EXACTLY); |
| @@ -63,6 +63,11 @@ public class TabularContextMenuViewPager extends ViewPager { |
| } |
| int fullHeight = menuHeight + tabHeight; |
| + int deviceHeightPx = getResources().getDisplayMetrics().heightPixels; |
| + int contextMenuVerticalPadding = |
| + getResources().getDimensionPixelSize(R.dimen.context_menu_min_vertical_padding); |
| + fullHeight = Math.min(fullHeight, deviceHeightPx - 2 * contextMenuVerticalPadding); |
| + |
| heightMeasureSpec = MeasureSpec.makeMeasureSpec(fullHeight, MeasureSpec.EXACTLY); |
| super.onMeasure(widthMeasureSpec, heightMeasureSpec); |
| } |