Refresh the UA hamburger icon when addons are updated. (#3785)

MozillaReality · Aug 12, 2020 · 06c02fa · 06c02fa
1 parent 46b186b
commit 06c02fa
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/HamburgerMenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/HamburgerMenuWidget.java
@@ -54,11 +54,13 @@ public interface MenuDelegate {
     boolean mSendTabEnabled = false;
     private ArrayList<HamburgerMenuAdapter.MenuItem> mItems;
     private MenuDelegate mDelegate;
+    private int mCurrentUAMode;
 
     public HamburgerMenuWidget(@NonNull Context aContext) {
         super(aContext);
 
         mItems = new ArrayList<>();
+        mCurrentUAMode = SettingsStore.getInstance(aContext).getUaMode();
 
         updateUI();
     }
@@ -135,6 +137,7 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
     }
 
     public void setUAMode(int uaMode) {
+        mCurrentUAMode = uaMode;
         HamburgerMenuAdapter.MenuItem item = getSwitchModeIndex();
         if (item != null) {
             switch (uaMode) {
@@ -224,7 +227,7 @@ private void updateItems() {
                     .build());
         }
 
-        mItems.add(new HamburgerMenuAdapter.MenuItem.Builder(
+        HamburgerMenuAdapter.MenuItem item = new HamburgerMenuAdapter.MenuItem.Builder(
                 HamburgerMenuAdapter.MenuItem.TYPE_DEFAULT,
                 (menuItem) -> {
                     if (mDelegate != null) {
@@ -234,8 +237,20 @@ private void updateItems() {
                 })
                 .withId(SWITCH_ITEM_ID)
                 .withTitle(getContext().getString(R.string.hamburger_menu_switch_to_desktop))
-                .withIcon(R.drawable.ic_icon_ua_default)
-                .build());
+                .build();
+        switch (mCurrentUAMode) {
+            case GeckoSessionSettings.USER_AGENT_MODE_DESKTOP: {
+                item.setIcon(R.drawable.ic_icon_ua_desktop);
+            }
+            break;
+
+            case GeckoSessionSettings.USER_AGENT_MODE_MOBILE:
+            case GeckoSessionSettings.USER_AGENT_MODE_VR: {
+                item.setIcon(R.drawable.ic_icon_ua_default);
+            }
+            break;
+        }
+        mItems.add(item);
 
         mAdapter.setItems(mItems);
         mAdapter.notifyDataSetChanged();