Adding smarter resizing logic for the context menu on orientation changes

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuViewPager.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.contextmenu;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 
 import org.chromium.chrome.R;
 
 /**
  * When there is more than one view for the context menu to display, it wraps the display in a view
  * pager.
  */
 public class TabularContextMenuViewPager extends ViewPager {
-    private static final double MAX_WIDTH_PROPORTION = 0.75;
+    private final int mContextMenuMinimumPaddingPx =
+            getResources().getDimensionPixelSize(R.dimen.context_menu_min_padding);
 
     public TabularContextMenuViewPager(Context context) {
         super(context);
     }
 
     public TabularContextMenuViewPager(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     /**
      * Used to show the full ViewPager dialog. Without this the dialog would have no height or
      * width.
      */
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int menuHeight = 0;
         int tabHeight = 0;
 
         // getCurrentItem() does not take into account the tab layout unlike getChildCount().
         int currentItemsIndex = getCurrentItem() + 1;
 
-        // TODO(injae): Fix sizing on orientation changes (crbug.com/731173)
-        int contextMenuWidth = (int) Math.min(
-                getResources().getDisplayMetrics().widthPixels * MAX_WIDTH_PROPORTION,
+        // set the context menu width

[gone, 2017/06/26 21:57:23]

English sentences, capital letters and punctuation.

[Daniel Park, 2017/06/29 18:22:58]

Done.

+        int deviceWidthPx = getResources().getDisplayMetrics().widthPixels;
+        int contextMenuWidth = Math.min(deviceWidthPx - 2 * mContextMenuMinimumPaddingPx,
                 getResources().getDimensionPixelSize(R.dimen.context_menu_max_width));
 
         widthMeasureSpec = MeasureSpec.makeMeasureSpec(contextMenuWidth, MeasureSpec.EXACTLY);
 
+        // figure out which view is about to displayed & measure that view's height

[gone, 2017/06/26 21:57:23]

This current only applies to the block at line 62, right?

It seems that what it's doing is measuring how tall the displayed view and the
tabs are when displayed together.

[Daniel Park, 2017/06/29 18:22:58]

Done.

         for (int i = 0; i < getChildCount(); i++) {
             View child = getChildAt(i);
 
             child.measure(
                     widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
             int measuredHeight = child.getMeasuredHeight();
 
             // The ViewPager also considers the tab layout one of its children, and needs to be
             // treated separately from getting the largest height.
             if (child.getId() == R.id.tab_layout && child.getVisibility() != GONE) {
                 tabHeight = measuredHeight;
             } else if (i == currentItemsIndex) {
                 menuHeight = child.getMeasuredHeight();
                 break;
             }
         }
+
+        // set the context menu height
         int fullHeight = menuHeight + tabHeight;
+        int deviceHeightPx = getResources().getDisplayMetrics().heightPixels;
+        fullHeight = Math.min(fullHeight, deviceHeightPx - 2 * mContextMenuMinimumPaddingPx);
 
         heightMeasureSpec = MeasureSpec.makeMeasureSpec(fullHeight, MeasureSpec.EXACTLY);
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 }