tor-browser

commit 65286773dfdfd75795f801b69367e22bff2cad17
parent d3ef834136f39cf06f32a700a8d22b4959729d4a
Author: mike a. <mavduevskiy@mozilla.com>
Date:   Wed, 29 Oct 2025 09:53:21 +0000

Bug 1996956 - Place 'other' icons first in the app icon list r=android-reviewers,twhite

Differential Revision: https://phabricator.services.mozilla.com/D270396

Diffstat:
M
mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuCustomizeRobot.kt
 | 
30
+++++++++++++++---------------
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/AppIconRepository.kt
 | 
20
++++++++++----------

2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuCustomizeRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuCustomizeRobot.kt
@@ -175,11 +175,26 @@ class SettingsSubMenuCustomizeRobot {
         Log.i(TAG, "verifyAppIconSettingItems: Trying to verify that the \"App icon\" setting items are displayed")
         verifyAppIconOptionIsDisplayed(
             composeTestRule,
+            // Other section
+            R.string.alternative_app_icon_group_other,
+            R.string.alternative_app_icon_option_retro_2004,
+            R.string.alternative_app_icon_option_pixelated,
+            R.string.alternative_app_icon_option_cuddling,
+            R.string.alternative_app_icon_option_pride,
+            R.string.alternative_app_icon_option_flaming,
+            R.string.alternative_app_icon_option_minimal,
+            R.string.alternative_app_icon_option_momo,
+            R.string.alternative_app_icon_option_momo_subtitle,
+            R.string.alternative_app_icon_option_cool,
             // Solid colors section
             R.string.alternative_app_icon_group_solid_colors,
             R.string.alternative_app_icon_option_default,
             R.string.alternative_app_icon_option_light,
             R.string.alternative_app_icon_option_dark,
+        )
+        scrollToElementByText(getStringResource(R.string.alternative_app_icon_option_gradient_northern_lights))
+        verifyAppIconOptionIsDisplayed(
+            composeTestRule,
             R.string.alternative_app_icon_option_red,
             R.string.alternative_app_icon_option_green,
             R.string.alternative_app_icon_option_blue,
@@ -192,23 +207,8 @@ class SettingsSubMenuCustomizeRobot {
             R.string.alternative_app_icon_option_gradient_blue_hour,
             R.string.alternative_app_icon_option_gradient_twilight,
             R.string.alternative_app_icon_group_gradients,
-            )
-        scrollToElementByText(getStringResource(R.string.alternative_app_icon_option_cool))
-        verifyAppIconOptionIsDisplayed(
-            composeTestRule,
             R.string.alternative_app_icon_option_gradient_midnight,
             R.string.alternative_app_icon_option_gradient_northern_lights,
-            // Other section
-            R.string.alternative_app_icon_group_other,
-            R.string.alternative_app_icon_option_retro_2004,
-            R.string.alternative_app_icon_option_pixelated,
-            R.string.alternative_app_icon_option_cuddling,
-            R.string.alternative_app_icon_option_pride,
-            R.string.alternative_app_icon_option_flaming,
-            R.string.alternative_app_icon_option_minimal,
-            R.string.alternative_app_icon_option_momo,
-            R.string.alternative_app_icon_option_momo_subtitle,
-            R.string.alternative_app_icon_option_cool,
         )
         Log.i(TAG, "verifyAppIconSettingItems: Verified that the \"App icon\" setting items are displayed")
     }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/AppIconRepository.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/AppIconRepository.kt
@@ -41,6 +41,16 @@ class DefaultAppIconRepository(
 
     override val groupedAppIcons: Map<IconGroupTitle, List<AppIcon>>
         get() = mapOf(
+            IconGroupTitle(R.string.alternative_app_icon_group_other) to listOf(
+                AppIcon.AppRetro2004,
+                AppIcon.AppPixelated,
+                AppIcon.AppCuddling,
+                AppIcon.AppPride,
+                AppIcon.AppFlaming,
+                AppIcon.AppMinimal,
+                AppIcon.AppMomo,
+                AppIcon.AppCool,
+            ),
             IconGroupTitle(R.string.alternative_app_icon_group_solid_colors) to listOf(
                 AppIcon.AppDefault,
                 AppIcon.AppSolidLight,
@@ -60,16 +70,6 @@ class DefaultAppIconRepository(
                 AppIcon.AppGradientMidnight,
                 AppIcon.AppGradientNorthernLights,
             ),
-            IconGroupTitle(R.string.alternative_app_icon_group_other) to listOf(
-                AppIcon.AppRetro2004,
-                AppIcon.AppPixelated,
-                AppIcon.AppCuddling,
-                AppIcon.AppPride,
-                AppIcon.AppFlaming,
-                AppIcon.AppMinimal,
-                AppIcon.AppMomo,
-                AppIcon.AppCool,
-            ),
         )
 
     @VisibleForTesting