commit 5f69ec3ff974cc330813df72e2209e87ad311e4a parent 4d0ac211cc53d0c9cd753764d467b711fbf00614 Author: clairehurst <clairehurst@torproject.org> Date: Tue, 13 Jan 2026 19:00:25 -0700 fixup! [android] Rename as Tor Browser tor-browser#44469 Fix branding on Android RR Diffstat:
23 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher.xml b/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> diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_round.xml b/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> diff --git a/mobile/android/fenix/app/src/debug/ic_launcher-playstore.png b/mobile/android/fenix/app/src/debug/ic_launcher-playstore.png Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher.xml b/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> diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher_round.xml b/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> diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt @@ -609,7 +609,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, ), diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt b/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, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt b/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), ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt @@ -173,7 +173,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.R.mipmap.ic_launcher, + R.mipmap.ic_launcher_foreground, ) val appName = context.getString(R.string.app_name) diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_about.xml b/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="@mipmap/ic_launcher" + app:srcCompat="@mipmap/ic_launcher_foreground" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml b/mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml @@ -18,6 +18,6 @@ android:layout_gravity="center" android:contentDescription="@string/search_widget_content_description_2" android:scaleType="centerInside" - tools:src="@mipmap/ic_launcher"/> + tools:src="@mipmap/ic_launcher_foreground"/> </FrameLayout> diff --git a/mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml b/mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml @@ -18,5 +18,5 @@ android:layout_gravity="center" android:contentDescription="@string/search_widget_content_description_2" android:scaleType="centerInside" - tools:src="@mipmap/ic_launcher" /> + tools:src="@mipmap/ic_launcher_foreground"/> </FrameLayout> diff --git a/mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/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> diff --git a/mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/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> diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher.xml b/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> diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_round.xml b/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> diff --git a/mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher.xml b/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> diff --git a/mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_round.xml b/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>
