CHnage vpn menu order

android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java

@@ -92,7 +92,6 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie
             }
         } else {
             menu.findItem(R.id.request_brave_vpn_row_menu_id).setVisible(false);
-            menu.findItem(R.id.divider_line_id).setVisible(false);
         }
 
         // Brave's items are only visible for page menu.
@@ -112,11 +111,13 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie
         // Always hide share row menu item in app menu if it's not on tablet.
         if (!mIsTablet) menu.findItem(R.id.share_row_menu_id).setVisible(false);
 
-        MenuItem setAsDefault =
-                menu.add(Menu.NONE, R.id.set_default_browser, 0, R.string.menu_set_default_browser);
+        MenuItem setAsDefault = menu.findItem(R.id.set_default_browser);
         if (shouldShowIconBeforeItem()) {
+            setAsDefault.setVisible(true);
             setAsDefault.setIcon(
                     AppCompatResources.getDrawable(mContext, R.drawable.brave_menu_set_as_default));
+        } else {
+            setAsDefault.setVisible(true);
         }
 
         if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)

android/preprocess/xml/menu_main_menu_xml.py

@@ -17,6 +17,15 @@ def _ProcessXML(root):
   idx = list(parent).index(child)
   parent.insert(idx + 1, node)
 
+  set_as_default_node_str = '<item xmlns:android="http://schemas.android.com/apk/res/android" '\
+    'android:id="@+id/set_default_browser" ' \
+    'android:title="@string/menu_set_default_browser" ' \
+    'android:visibility="gone" />'
+  set_as_default_node = ET.fromstring(set_as_default_node_str, parser=ET.XMLParser(encoding="utf-8"))
+  set_as_default_child = parent.find('item/[@android:id="@+id/preferences_id"]', namespaces=ns)
+  set_as_default_idx = list(parent).index(set_as_default_child)
+  parent.insert(set_as_default_idx + 1, set_as_default_node)
+
   vpn_node_str = '<item xmlns:android="http://schemas.android.com/apk/res/android" '\
           'android:id="@+id/request_brave_vpn_row_menu_id" '\
           'android:title="@null"> '\
@@ -30,13 +39,8 @@ def _ProcessXML(root):
           '</menu> '\
           '</item>'
   vpn_node = ET.fromstring(vpn_node_str, parser=ET.XMLParser(encoding="utf-8"))
-  vpn_child = parent.find('item/[@android:id="@+id/update_menu_id"]', namespaces=ns)
+  vpn_child = parent.find('item/[@android:id="@+id/set_default_browser"]', namespaces=ns)
   vpn_idx = list(parent).index(vpn_child)
   parent.insert(vpn_idx + 1, vpn_node)
-  vpn_divider_str = '<item xmlns:android="http://schemas.android.com/apk/res/android" '\
-            'android:id="@id/divider_line_id" '\
-            'android:title="@null" />'
-  vpn_divider_node = ET.fromstring(vpn_divider_str, parser=ET.XMLParser(encoding="utf-8"))
-  parent.insert(vpn_idx + 2, vpn_divider_node)
 
   return root