Merge pull request #5421 from brave/pr5412_android_fixed_disabled_bot…

…tom_toolbar_no_rewards_1.8.x Fixed top toolbar with disabled bottom toolbar and no rewards icon (uplift to 1.8.x)
brave · May 5, 2020 · 6ad0f61 · 6ad0f61
2 parents bbf42b2 + 5517e7c
commit 6ad0f61
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
@@ -385,7 +385,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 +