Uplift of #5412 (squashed) to beta

brave · May 4, 2020 · c301961 · c301961
1 parent b4cbc6f
commit c301961
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
@@ -381,7 +381,8 @@ protected int getBoundsAfterAccountingForRightButtons(
       }
       ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams)toolbarButtonsContainer.getLayoutParams();
 
-      int rewardsLen = mRewardsLayout == null ? 0 : mRewardsLayout.getWidth();
+      int rewardsLen = (mRewardsLayout == null || mRewardsLayout.getVisibility() == View.GONE) ? 0
+              : mRewardsLayout.getWidth();
       return toolbarButtonsContainer.getMeasuredWidth() -
             mShieldsLayout.getWidth() -
             rewardsLen +