Dan Ballard pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 7f1abaee by clairehurst at 2026-03-09T11:04:48-06:00 fixup! [android] Rename as Tor Browser - - - - - 21 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/tabstrip/TabStrip.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/ThumbnailImage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/AppIconRepository.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabitems/TabGridItem.kt - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_alternative.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_blue_hour.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_golden_hour.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_midnight.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_northern_lights.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_sunrise.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_sunset.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_twilight.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round_alternative.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_blue.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_dark.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_green.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_light.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_purple.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_purple_dark.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_red.xml - mobile/android/fenix/app/src/main/res/values/styles.xml Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/tabstrip/TabStrip.kt ===================================== @@ -450,7 +450,7 @@ private fun TabStripIcon( ) } else if (url == ABOUT_HOME_URL) { Favicon( - imageResource = R.drawable.ic_firefox, + imageResource = R.drawable.tor_browser_app_icon, size = tabStripIconSize, ) } else { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/ThumbnailImage.kt ===================================== @@ -182,7 +182,7 @@ private fun FallbackContent( ) } else if (tab.content.url == ABOUT_HOME_URL) { Image( - painter = painterResource(id = R.drawable.ic_firefox), + painter = painterResource(id = R.drawable.tor_browser_app_icon), contentDescription = null, modifier = Modifier .size(FallbackIconSize) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/AppIconRepository.kt ===================================== @@ -41,16 +41,6 @@ class DefaultAppIconRepository( override val groupedAppIcons: Map<IconGroupTitle, List<AppIcon>> get() = mapOf( - IconGroupTitle(R.string.alternative_app_icon_group_featured) 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, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabitems/TabGridItem.kt ===================================== @@ -214,7 +214,7 @@ private fun TabContent( ) } else if (tab.content.url == ABOUT_HOME_URL) { Image( - painter = painterResource(id = R.drawable.ic_firefox), + painter = painterResource(id = R.drawable.tor_browser_app_icon), contentDescription = null, modifier = Modifier.size(TabHeaderFaviconSize), ) ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_alternative.xml ===================================== @@ -4,6 +4,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/photonWhite"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_blue_hour.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_gradient_blue_hour_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_golden_hour.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_gradient_golden_hour_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_midnight.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_gradient_midnight_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_northern_lights.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_gradient_northern_lights_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_sunrise.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_gradient_sunrise_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_sunset.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_gradient_sunset_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_twilight.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_gradient_twilight_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round_alternative.xml ===================================== @@ -4,6 +4,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/photonWhite"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_blue.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_solid_blue_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_dark.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@color/photonBlack"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_green.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_solid_green_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_light.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@color/photonWhite"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_purple.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_solid_purple_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_purple_dark.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_solid_purple_dark_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_red.xml ===================================== @@ -6,6 +6,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <background android:drawable="@drawable/ic_launcher_solid_red_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/values/styles.xml ===================================== @@ -4,8 +4,8 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources xmlns:tools="http://schemas.android.com/tools"> <style name="SplashScreenThemeBase" parent="Theme.SplashScreen"> - <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item> - <item name="windowSplashScreenBackground">@color/fx_mobile_splashscreen_background</item> + <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item> + <item name="windowSplashScreenBackground">@color/tor_homepage_gradient_end</item> <item name="postSplashScreenTheme">@style/NormalTheme</item> <item name="windowSplashScreenAnimationDuration">12000</item> <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">default</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7f1abaee... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7f1abaee... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
Dan Ballard (@dan)