diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 9bdce98d9506..82057eb09a23 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -3027,7 +3027,6 @@ public class BrowserApp extends GeckoApp
bookmark.setVisible(!inGuestMode);
bookmark.setCheckable(true);
bookmark.setChecked(tab.isBookmark());
- bookmark.setIcon(resolveBookmarkIconID(tab.isBookmark()));
bookmark.setTitle(resolveBookmarkTitleID(tab.isBookmark()));
reader.setEnabled(isAboutReader || !AboutPages.isAboutPage(tab.getURL()));
@@ -3035,9 +3034,14 @@ public class BrowserApp extends GeckoApp
reader.setCheckable(true);
final boolean isPageInReadingList = tab.isInReadingList();
reader.setChecked(isPageInReadingList);
- reader.setIcon(resolveReadingListIconID(isPageInReadingList));
reader.setTitle(resolveReadingListTitleID(isPageInReadingList));
+ if (Versions.feature11Plus) {
+ // We don't use icons on GB builds so not resolving icons might conserve resources.
+ bookmark.setIcon(resolveBookmarkIconID(tab.isBookmark()));
+ reader.setIcon(resolveReadingListIconID(isPageInReadingList));
+ }
+
back.setEnabled(tab.canDoBack());
forward.setEnabled(tab.canDoForward());
desktopMode.setChecked(tab.getDesktopMode());
@@ -3186,6 +3190,7 @@ public class BrowserApp extends GeckoApp
}
private int resolveBookmarkIconID(final boolean isBookmark) {
+ Assert.isTrue(Versions.feature11Plus, "We don't use menu icons on v11+ so don't set them to conserve resources.");
if (isBookmark) {
return R.drawable.ic_menu_bookmark_remove;
} else {
@@ -3198,6 +3203,7 @@ public class BrowserApp extends GeckoApp
}
private int resolveReadingListIconID(final boolean isInReadingList) {
+ Assert.isTrue(Versions.feature11Plus, "We don't use menu icons on v11+ so don't set them to conserve resources.");
return (isInReadingList ? R.drawable.ic_menu_reader_remove : R.drawable.ic_menu_reader_add);
}
@@ -3229,13 +3235,19 @@ public class BrowserApp extends GeckoApp
if (item.isChecked()) {
Telemetry.sendUIEvent(TelemetryContract.Event.UNSAVE, TelemetryContract.Method.MENU, "bookmark");
tab.removeBookmark();
- item.setIcon(resolveBookmarkIconID(false));
item.setTitle(resolveBookmarkTitleID(false));
+ if (Versions.feature11Plus) {
+ // We don't use icons on GB builds so not resolving icons might conserve resources.
+ item.setIcon(resolveBookmarkIconID(false));
+ }
} else {
Telemetry.sendUIEvent(TelemetryContract.Event.SAVE, TelemetryContract.Method.MENU, "bookmark");
tab.addBookmark();
- item.setIcon(resolveBookmarkIconID(true));
item.setTitle(resolveBookmarkTitleID(true));
+ if (Versions.feature11Plus) {
+ // We don't use icons on GB builds so not resolving icons might conserve resources.
+ item.setIcon(resolveBookmarkIconID(true));
+ }
}
}
return true;
@@ -3247,13 +3259,19 @@ public class BrowserApp extends GeckoApp
if (item.isChecked()) {
Telemetry.sendUIEvent(TelemetryContract.Event.UNSAVE, TelemetryContract.Method.MENU, "reading_list");
tab.removeFromReadingList();
- item.setIcon(resolveReadingListIconID(false));
item.setTitle(resolveReadingListTitleID(false));
+ if (Versions.feature11Plus) {
+ // We don't use icons on GB builds so not resolving icons might conserve resources.
+ item.setIcon(resolveReadingListIconID(false));
+ }
} else {
Telemetry.sendUIEvent(TelemetryContract.Event.SAVE, TelemetryContract.Method.MENU, "reading_list");
tab.addToReadingList();
- item.setIcon(resolveReadingListIconID(true));
item.setTitle(resolveReadingListTitleID(true));
+ if (Versions.feature11Plus) {
+ // We don't use icons on GB builds so not resolving icons might conserve resources.
+ item.setIcon(resolveReadingListIconID(true));
+ }
}
}
return true;
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_back.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-hdpi/ic_menu_back.png
rename to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_add.png
deleted file mode 100644
index 03a57c998cbf..000000000000
Binary files a/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_add.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_remove.png
deleted file mode 100644
index 9e23244e2691..000000000000
Binary files a/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_remove.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_forward.png
deleted file mode 100644
index 99138a56b96c..000000000000
Binary files a/mobile/android/base/resources/drawable-hdpi/ic_menu_forward.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab.png
deleted file mode 100644
index 496ff3517df5..000000000000
Binary files a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab.png
deleted file mode 100644
index d7c6dfa117f8..000000000000
Binary files a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_reload.png
deleted file mode 100644
index 24026f9c070a..000000000000
Binary files a/mobile/android/base/resources/drawable-hdpi/ic_menu_reload.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png
rename to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_add.png
deleted file mode 100644
index 042dee803279..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_add.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_remove.png
deleted file mode 100644
index 50d992e7395a..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_remove.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_forward.png
deleted file mode 100644
index 51fea1bc4925..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi/ic_menu_forward.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab.png
deleted file mode 100644
index 0ca97ab7ed51..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab.png
deleted file mode 100644
index 3b2622ec767c..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_reload.png
deleted file mode 100644
index 712916f45d07..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi/ic_menu_reload.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml b/mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml
new file mode 100644
index 000000000000..2afadaf5e23b
--- /dev/null
+++ b/mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml
@@ -0,0 +1,9 @@
+
+
+
+
+