Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Android] Fix for menu location in CustomToolbar

Browse Source 
Fixes the error in CustomToolbar that menu is shown from bottom.

Chromium change:
https://chromium.googlesource.com/chromium/src.git/+/ad4cf0623574d9d7ea517d0063cb054d98766964

Duet: Clean up unused classes and resources

Delete all the classes and resources left unused by
Duet (BottomToolbar).

Bug: 1081343
This commit is contained in:
samartnik
2020-10-28 14:04:02 -04:00
committed by mkarolin
parent 4c25259f6e
commit 6e17ab380f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
+10
View File
@@ -69,7 +69,10 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabModelObserver;
import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
import org.chromium.chrome.browser.toolbar.HomeButton;
import org.chromium.chrome.browser.toolbar.ToolbarColors;
import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
import org.chromium.chrome.browser.toolbar.ToolbarTabController;
import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager;
import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator;
import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator;
import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
import org.chromium.chrome.browser.util.PackageUtils;
@@ -805,4 +808,11 @@ public abstract class BraveToolbarLayout extends ToolbarLayout implements OnClic
private boolean isMenuButtonOnBottom() {
return mIsBottomToolbarVisible && BottomToolbarVariationManager.isMenuButtonOnBottom();
}
@Override
protected void initialize(ToolbarDataProvider toolbarDataProvider,
ToolbarTabController tabController, MenuButtonCoordinator menuButtonCoordinator) {
super.initialize(toolbarDataProvider, tabController, menuButtonCoordinator);
BraveMenuButtonCoordinator.setMenuFromBottom(isMenuButtonOnBottom());
}
}