Merge remote-tracking branch 'upstream/develop' into develop

Author: Nicolas Gonzalez

lib/res/values/dimens.xml

@@ -68,7 +68,9 @@
     <dimen name="design_bottom_navigation_margin">8dp</dimen>
     <dimen name="design_bottom_navigation_item_min_width">56dp</dimen>
     <dimen name="design_bottom_navigation_item_max_width">96dp</dimen>
+    <dimen name="design_bottom_navigation_item_min_height">56dp</dimen>
+    <dimen name="design_bottom_navigation_item_max_height">96dp</dimen>
     <dimen name="design_bottom_navigation_active_item_max_width">168dp</dimen>
-    <dimen name="design_bottom_navigation_active_item_max_height">56dp</dimen>
+    <dimen name="design_bottom_navigation_active_item_max_height">168dp</dimen>
 
 </resources>

lib/src/android/support/design/internal/BottomNavigationItemView.java

@@ -34,6 +34,7 @@
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -144,7 +145,8 @@ public void setChecked(boolean checked) {
     if (mShiftingMode) {
       if (checked) {
         LayoutParams iconParams = (LayoutParams) mIcon.getLayoutParams();
-        iconParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.TOP;
+        iconParams.gravity = mTabletMode ? Gravity.CENTER :
+                (Gravity.CENTER_HORIZONTAL | Gravity.TOP);
         iconParams.topMargin = mDefaultMargin;
         mIcon.setLayoutParams(iconParams);
         mLargeLabel.setVisibility(VISIBLE);

lib/src/android/support/design/internal/BottomNavigationMenuView.java

@@ -31,14 +31,18 @@
 import android.support.v7.view.menu.MenuItemImpl;
 import android.support.v7.view.menu.MenuView;
 import android.util.AttributeSet;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 /** @hide For internal use only. */
 @RestrictTo(LIBRARY_GROUP)
 public class BottomNavigationMenuView extends ViewGroup implements MenuView {
   private final int mInactiveItemMaxWidth;
   private final int mInactiveItemMinWidth;
+  private final int mInactiveItemMaxHeight;
+  private final int mInactiveItemMinHeight;
   private final int mActiveItemMaxWidth;
   private final int mActiveItemMaxHeight;
   private final int mItemWidth;
@@ -72,6 +76,10 @@ public BottomNavigationMenuView(Context context, AttributeSet attrs) {
         res.getDimensionPixelSize(R.dimen.design_bottom_navigation_item_max_width);
     mInactiveItemMinWidth =
         res.getDimensionPixelSize(R.dimen.design_bottom_navigation_item_min_width);
+    mInactiveItemMaxHeight =
+            res.getDimensionPixelSize(R.dimen.design_bottom_navigation_item_max_height);
+    mInactiveItemMinHeight =
+            res.getDimensionPixelSize(R.dimen.design_bottom_navigation_item_min_height);
     mActiveItemMaxWidth =
         res.getDimensionPixelSize(R.dimen.design_bottom_navigation_active_item_max_width);
     mActiveItemMaxHeight =
@@ -112,7 +120,10 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
     final int heightSpec = MeasureSpec.makeMeasureSpec(mItemHeight, MeasureSpec.EXACTLY);
 
-    if (mShiftingMode) {
+    if (mTabletMode) {
+      measureTabletMode(heightMeasureSpec);
+      return;
+    } else if (mShiftingMode) {
       final int inactiveCount = count - 1;
       final int activeMaxAvailable = width - inactiveCount * mInactiveItemMinWidth;
       final int activeWidth = Math.min(activeMaxAvailable, mActiveItemMaxWidth);
@@ -126,9 +137,6 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
           extra--;
         }
       }
-    } else if (mTabletMode) {
-      measureTabletMode(heightMeasureSpec);
-      return;
     } else {
       final int maxAvailable = width / (count == 0 ? 1 : count);
       final int childWidth = Math.min(maxAvailable, mActiveItemMaxWidth);
@@ -166,14 +174,30 @@ private void measureTabletMode(int heightMeasureSpec) {
 
     final int widthSpec = MeasureSpec.makeMeasureSpec(mItemWidth, MeasureSpec.EXACTLY);
 
-    final int maxAvailable = height / (count == 0 ? 1 : count);
-    final int childHeight = Math.min(maxAvailable, mActiveItemMaxHeight);
-    int extra = height - childHeight * count;
-    for (int i = 0; i < count; i++) {
-      mTempChildSizes[i] = childHeight;
-      if (extra > 0) {
-        mTempChildSizes[i]++;
-        extra--;
+    if (mShiftingMode) {
+      final int inactiveCount = count - 1;
+      final int activeMaxAvailable = height - inactiveCount * mInactiveItemMinHeight;
+      final int activeHeight = Math.min(activeMaxAvailable, mActiveItemMaxHeight);
+      final int inactiveMaxAvailable = (height - activeHeight) / inactiveCount;
+      final int inactiveHeight = Math.min(inactiveMaxAvailable, mInactiveItemMaxHeight);
+      int extra = height - activeHeight - inactiveHeight * inactiveCount;
+      for (int i = 0; i < count; i++) {
+        mTempChildSizes[i] = (i == mActiveButton) ? activeHeight : inactiveHeight;
+        if (extra > 0) {
+          mTempChildSizes[i]++;
+          extra--;
+        }
+      }
+    } else {
+      final int maxAvailable = height / (count == 0 ? 1 : count);
+      final int childHeight = Math.min(maxAvailable, mActiveItemMaxHeight);
+      int extra = height - childHeight * count;
+      for (int i = 0; i < count; i++) {
+        mTempChildSizes[i] = childHeight;
+        if (extra > 0) {
+          mTempChildSizes[i]++;
+          extra--;
+        }
       }
     }
 
@@ -334,6 +358,11 @@ public void buildMenuView() {
     }
     mButtons = new BottomNavigationItemView[mMenu.size()];
     mShiftingMode = mMenu.size() > 3;
+    if (mTabletMode) {
+      FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) getLayoutParams();
+      params.gravity = mShiftingMode ? Gravity.CENTER : Gravity.TOP;
+      setLayoutParams(params);
+    }
     for (int i = 0; i < mMenu.size(); i++) {
       mPresenter.setUpdateSuspended(true);
       mMenu.getItem(i).setCheckable(true);

lib/src/android/support/design/widget/BottomNavigationView.java

@@ -161,7 +161,6 @@ public BottomNavigationView(Context context, AttributeSet attrs, int defStyleAtt
 
     if (a.hasValue(R.styleable.BottomNavigationView_tabletMode)) {
       mTabletMode = a.getBoolean(R.styleable.BottomNavigationView_tabletMode, false);
-      params.gravity = Gravity.TOP;
       mMenuView.setTabletMode(mTabletMode);
     }