From e45eddf0fdfd8042ca830dc7cf6a8eeeebd9a71b Mon Sep 17 00:00:00 2001
From: samartnik <30602739+samartnik@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:40:44 -0400
Subject: [PATCH] [Android] Fix for custom tab menu position (#29697)

---
 .../toolbar/top/BraveToolbarLayoutImpl.java     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
index 2bdd0829f08..02322e58f02 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
@@ -1519,7 +1519,8 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
 
         BraveMenuButtonCoordinator.setMenuFromBottom(
                 isMenuButtonOnBottomControls()
-                        || BottomToolbarConfiguration.isToolbarBottomAnchored());
+                        || isToolbarPhone()
+                                && BottomToolbarConfiguration.isToolbarBottomAnchored());
     }
 
     public void updateWalletBadgeVisibility(boolean visible) {
@@ -1528,10 +1529,12 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
     }
 
     public void updateMenuButtonState() {
-        // No need to change the state if bottom controls are not enabled.
-        if (!BottomToolbarConfiguration.isBraveBottomControlsEnabled()) return;
-
-        BraveMenuButtonCoordinator.setMenuFromBottom(mIsBottomControlsVisible);
+        if (BottomToolbarConfiguration.isBraveBottomControlsEnabled()) {
+            BraveMenuButtonCoordinator.setMenuFromBottom(mIsBottomControlsVisible);
+        } else {
+            BraveMenuButtonCoordinator.setMenuFromBottom(
+                    isToolbarPhone() && BottomToolbarConfiguration.isToolbarBottomAnchored());
+        }
     }
 
     @Override
@@ -1589,4 +1592,8 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
             }
         }
     }
+
+    private boolean isToolbarPhone() {
+        return BraveReflectionUtil.equalTypes(this.getClass(), ToolbarPhone.class);
+    }
 }