Bug 1401394: Add missing gecko:itemType to non-phone configurations. r=liuche
I don't know the greater context of this code and if this will cause any problems: I'm just following the patterns in Android menus to fix this code.
:aswan is expected to test this patch for me (or provide me steps to test
whether or not it's working correctly).
MozReview-Commit-ID: 9WrqUokwmXT
--- a/mobile/android/app/src/main/res/menu-large-v26/browser_app_menu.xml
+++ b/mobile/android/app/src/main/res/menu-large-v26/browser_app_menu.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- We disable AlwaysShowAction because we interpret the menu
attributes ourselves and thus the warning isn't relevant to us. -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">
<item android:id="@+id/reload"
android:icon="@drawable/ic_menu_reload"
android:title="@string/reload"
android:showAsAction="always"/>
@@ -50,16 +51,17 @@
android:title="@string/find_in_page" />
<item android:id="@+id/desktop_mode"
android:title="@string/desktop_mode"
android:checkable="true" />
<item android:id="@+id/addons_top_level"
android:title="@string/addons"
+ gecko:itemType="icon_menu_item"
android:visible="false" />
<item android:id="@+id/page"
android:title="@string/page">
<menu>
<item android:id="@+id/subscribe"
--- a/mobile/android/app/src/main/res/menu-large/browser_app_menu.xml
+++ b/mobile/android/app/src/main/res/menu-large/browser_app_menu.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- We disable AlwaysShowAction because we interpret the menu
attributes ourselves and thus the warning isn't relevant to us. -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">
<item android:id="@+id/reload"
android:icon="@drawable/ic_menu_reload"
android:title="@string/reload"
android:showAsAction="always"/>
@@ -50,16 +51,17 @@
android:title="@string/find_in_page" />
<item android:id="@+id/desktop_mode"
android:title="@string/desktop_mode"
android:checkable="true" />
<item android:id="@+id/addons_top_level"
android:title="@string/addons"
+ gecko:itemType="icon_menu_item"
android:visible="false" />
<item android:id="@+id/page"
android:title="@string/page">
<menu>
<item android:id="@+id/subscribe"
--- a/mobile/android/app/src/main/res/menu-v26/browser_app_menu.xml
+++ b/mobile/android/app/src/main/res/menu-v26/browser_app_menu.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- We disable AlwaysShowAction because we interpret the menu
attributes ourselves and thus the warning isn't relevant to us. -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">
<item android:id="@+id/back"
android:icon="@drawable/ic_menu_back"
android:title="@string/back"
android:showAsAction="always"/>
@@ -50,16 +51,17 @@
android:title="@string/find_in_page" />
<item android:id="@+id/desktop_mode"
android:title="@string/desktop_mode"
android:checkable="true" />
<item android:id="@+id/addons_top_level"
android:title="@string/addons"
+ gecko:itemType="icon_menu_item"
android:visible="false" />
<item android:id="@+id/page"
android:title="@string/page">
<menu>
<item android:id="@+id/subscribe"
--- a/mobile/android/app/src/main/res/menu-xlarge-v26/browser_app_menu.xml
+++ b/mobile/android/app/src/main/res/menu-xlarge-v26/browser_app_menu.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- We disable AlwaysShowAction because we interpret the menu
attributes ourselves and thus the warning isn't relevant to us. -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">
<item android:id="@+id/reload"
android:icon="@drawable/ic_menu_reload"
android:title="@string/reload"
android:showAsAction="always"/>
@@ -46,16 +47,17 @@
<item android:id="@+id/history_list"
android:title="@string/history_title"/>
<item android:id="@+id/find_in_page"
android:title="@string/find_in_page" />
<item android:id="@+id/addons_top_level"
android:title="@string/addons"
+ gecko:itemType="icon_menu_item"
android:visible="false" />
<item android:id="@+id/desktop_mode"
android:title="@string/desktop_mode"
android:checkable="true" />
<item android:id="@+id/page"
--- a/mobile/android/app/src/main/res/menu-xlarge/browser_app_menu.xml
+++ b/mobile/android/app/src/main/res/menu-xlarge/browser_app_menu.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- We disable AlwaysShowAction because we interpret the menu
attributes ourselves and thus the warning isn't relevant to us. -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">
<item android:id="@+id/reload"
android:icon="@drawable/ic_menu_reload"
android:title="@string/reload"
android:showAsAction="always"/>
@@ -46,16 +47,17 @@
<item android:id="@+id/history_list"
android:title="@string/history_title"/>
<item android:id="@+id/find_in_page"
android:title="@string/find_in_page" />
<item android:id="@+id/addons_top_level"
android:title="@string/addons"
+ gecko:itemType="icon_menu_item"
android:visible="false" />
<item android:id="@+id/desktop_mode"
android:title="@string/desktop_mode"
android:checkable="true" />
<item android:id="@+id/page"