clairehurst pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: eff7fddc by clairehurst at 2026-01-15T15:51:01-07:00 fixup! [android] Rename as Tor Browser tor-browser#44469 Fix branding on Android RR - - - - - 25 changed files: - mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_round.xml - mobile/android/fenix/app/src/debug/ic_launcher-playstore.png - mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher_round.xml - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt - mobile/android/fenix/app/src/main/res/drawable/splash_screen.xml - mobile/android/fenix/app/src/main/res/layout/fragment_about.xml - mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml - mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_round.xml - mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_round.xml Changes: ===================================== mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> </adaptive-icon> ===================================== mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/debug/ic_launcher-playstore.png ===================================== Binary files a/mobile/android/fenix/app/src/debug/ic_launcher-playstore.png and b/mobile/android/fenix/app/src/debug/ic_launcher-playstore.png differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> </adaptive-icon> ===================================== mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt ===================================== @@ -610,7 +610,7 @@ private fun touPageUIData() = OnboardingPageUiData( lineThreeText = stringResource(id = R.string.onboarding_redesign_tou_body_three), lineThreeLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_three_link_text), ), - imageRes = R.drawable.ic_firefox, + imageRes = R.mipmap.ic_launcher_foreground, primaryButtonLabel = stringResource( id = R.string.onboarding_redesign_tou_agree_and_continue_button_label, ), ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt ===================================== @@ -232,7 +232,7 @@ private fun OnboardingPagePreview() { lineThreeText = stringResource(id = R.string.onboarding_redesign_tou_body_three), lineThreeLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_three_link_text), ), - imageRes = R.drawable.ic_firefox, + imageRes = R.mipmap.ic_launcher_foreground, primaryButton = Action( text = stringResource( id = R.string.onboarding_redesign_tou_agree_and_continue_button_label, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt ===================================== @@ -80,7 +80,7 @@ private fun RowScope.BrowserDetailsRow(selected: Boolean = false) { ) { if (selected) { Image( - painter = painterResource(R.drawable.ic_firefox), + painter = painterResource(R.mipmap.ic_launcher_foreground), contentDescription = null, // Decorative only. modifier = Modifier.size(24.dp), ) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt ===================================== @@ -167,7 +167,7 @@ class SearchWidgetProvider : AppWidgetProvider() { // gradient color available for android:fillColor only on SDK 24+ setImageViewResource( R.id.button_search_widget_new_tab_icon, - R.drawable.ic_launcher_foreground, + R.mipmap.ic_launcher_foreground, ) val appName = context.getString(R.string.app_name) ===================================== mobile/android/fenix/app/src/main/res/drawable/splash_screen.xml ===================================== @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:drawable="@drawable/ic_launcher_foreground" + android:drawable="@mipmap/ic_launcher_foreground" android:width="192dp" android:height="192dp" android:gravity="center" /> ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_about.xml ===================================== @@ -25,7 +25,7 @@ android:layout_marginEnd="130dp" android:contentDescription="@string/app_name" android:importantForAccessibility="no" - app:srcCompat="@drawable/ic_launcher_foreground" + app:srcCompat="@mipmap/ic_launcher_foreground" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml ===================================== @@ -139,7 +139,7 @@ android:contentDescription="@string/app_name" android:scaleX="1.8" android:scaleY="1.8" - app:srcCompat="@drawable/ic_launcher_foreground" + app:srcCompat="@mipmap/ic_launcher_foreground" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" ===================================== mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml ===================================== @@ -17,7 +17,7 @@ android:layout_gravity="center" android:contentDescription="@string/search_widget_content_description_2" android:scaleType="centerInside" - tools:src="@drawable/ic_launcher_foreground" + tools:src="@mipmap/ic_launcher_foreground" android:scaleX="1.5" android:scaleY="1.5"/> ===================================== mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml ===================================== @@ -17,7 +17,7 @@ android:layout_gravity="center" android:contentDescription="@string/search_widget_content_description_2" android:scaleType="centerInside" - tools:src="@drawable/ic_launcher_foreground" + tools:src="@mipmap/ic_launcher_foreground" android:scaleX="1.5" android:scaleY="1.5"/> </FrameLayout> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -3,7 +3,7 @@ - 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/. --> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> - <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -3,7 +3,7 @@ - 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/. --> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> - <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> </adaptive-icon> ===================================== mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> </adaptive-icon> ===================================== mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eff7fddc... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eff7fddc... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
clairehurst (@clairehurst)