commit 4d0ac211cc53d0c9cd753764d467b711fbf00614 parent debf870374466d73773865a22b030f05f9c1f28b Author: Matthew Finkel <sysrqb@torproject.org> Date: Fri, 31 Jul 2020 16:49:03 +0000 [android] Rename as Tor Browser Bug 40020: Change applicationId Bug 40020: Change app name Bug 40020: Change deeplink scheme Bug 40020: Change App icons Bug 40073: Use correct branding on About page Bug 40088: Use Tor Browser logo in migration screen Diffstat:
182 files changed, 356 insertions(+), 267 deletions(-)
diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle @@ -72,7 +72,7 @@ android { compileSdk { version = release(config.compileSdkMajorVersion) { minorApiLevel = config.compileSdkMinorVersion } } defaultConfig { - applicationId "org.mozilla" + applicationId "org.torproject" minSdk config.minSdkVersion targetSdk config.targetSdkVersion versionCode 1 @@ -92,7 +92,7 @@ android { // This should be the base URL used to call the AMO API. buildConfigField "String", "AMO_SERVER_URL", "\"https://services.addons.mozilla.org\"" - def deepLinkSchemeValue = "fenix-dev" + def deepLinkSchemeValue = "torbrowser-dev" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" manifestPlaceholders = [ @@ -134,14 +134,14 @@ android { debug { shrinkResources = false minifyEnabled = false - applicationIdSuffix ".fenix.debug" + applicationIdSuffix ".torbrowser_debug" resValue "bool", "IS_DEBUG", "true" pseudoLocalesEnabled = true } nightly releaseTemplate >> { - applicationIdSuffix ".fenix" + applicationIdSuffix ".torbrowser_nightly" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" - def deepLinkSchemeValue = "fenix-nightly" + def deepLinkSchemeValue = "torbrowser-nightly" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" manifestPlaceholders.putAll([ "deepLinkScheme": deepLinkSchemeValue @@ -149,8 +149,8 @@ android { } beta releaseTemplate >> { buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" - applicationIdSuffix ".firefox_beta" - def deepLinkSchemeValue = "fenix-beta" + applicationIdSuffix ".torbrowser_alpha" + def deepLinkSchemeValue = "torbrowser-alpha" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" manifestPlaceholders.putAll([ // This release type is meant to replace Firefox (Beta channel) and therefore needs to inherit @@ -160,14 +160,14 @@ android { // fatal consequences. For example see: // - https://issuetracker.google.com/issues/36924841 // - https://issuetracker.google.com/issues/36905922 - "sharedUserId": "org.mozilla.firefox.sharedID", + "sharedUserId": "org.torproject.torbrowser_alpha.sharedID", "deepLinkScheme": deepLinkSchemeValue, ]) } release releaseTemplate >> { buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" - applicationIdSuffix ".firefox" - def deepLinkSchemeValue = "fenix" + applicationIdSuffix ".torbrowser" + def deepLinkSchemeValue = "torbrowser" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" manifestPlaceholders.putAll([ // This release type is meant to replace Firefox (Release channel) and therefore needs to inherit @@ -177,7 +177,7 @@ android { // fatal consequences. For example see: // - https://issuetracker.google.com/issues/36924841 // - https://issuetracker.google.com/issues/36905922 - "sharedUserId": "org.mozilla.firefox.sharedID", + "sharedUserId": "org.torproject.torbrowser.sharedID", "deepLinkScheme": deepLinkSchemeValue, ]) } diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt @@ -74,10 +74,10 @@ class SettingsSubMenuAboutRobot { } fun verifyProductCompany() { - Log.i(TAG, "verifyProductCompany: Trying to verify that the about section contains the company that produced the app info: ${"$appName is produced by Mozilla."}") + Log.i(TAG, "verifyProductCompany: Trying to verify that the about section contains the company that produced the app info: ${"$appName is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit."}") onView(withId(R.id.about_content)) - .check(matches(withText(containsString("$appName is produced by Mozilla.")))) - Log.i(TAG, "verifyProductCompany: Verified that the about section contains the company that produced the app info: \"$appName is produced by Mozilla.\"") + .check(matches(withText(containsString("$appName is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit.")))) + Log.i(TAG, "verifyProductCompany: Verified that the about section contains the company that produced the app info: \"$appName is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit.\"") } fun verifyCurrentTimestamp() { diff --git a/mobile/android/fenix/app/src/beta/ic_launcher-playstore.png b/mobile/android/fenix/app/src/beta/ic_launcher-playstore.png Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/drawable-anydpi/ic_tor_browser_close_tabs_notification.xml b/mobile/android/fenix/app/src/beta/res/drawable-anydpi/ic_tor_browser_close_tabs_notification.xml @@ -0,0 +1,24 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="256" + android:viewportHeight="257" + android:tint="#FFFFFF"> + <group android:scaleX="1.84" + android:scaleY="1.84" + android:translateX="-107.52" + android:translateY="-107.94"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M62.56,111.94C67,111.94 70.72,110.38 73.92,107.17C77.13,103.96 78.68,99.93 78.68,94.86C78.68,90.5 77.04,86.73 73.65,83.34L73.63,83.32C70.34,79.95 66.63,78.31 62.29,78.31C58.59,78.31 55.28,79.9 52.17,83.17C49.12,86.38 47.63,90.16 47.63,94.72C47.63,97.37 47.99,99.8 48.7,101.94C49.48,104.04 50.53,105.88 51.84,107.43C53.11,108.84 54.66,109.98 56.45,110.81C58.27,111.56 60.33,111.94 62.56,111.94Z" + android:fillColor="#4A454E"/> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM90.71,94.86C90.71,102.56 93.36,108.02 98.8,111.54C100.29,112.5 101.06,114.24 100.75,115.96L99.93,120.5C99.68,121.87 98.79,123.03 97.53,123.61C96.29,124.18 94.9,124.11 93.71,123.42C89.35,120.88 86.16,117.89 84.18,114.5C82.28,116.93 79.87,119.01 76.97,120.71L76.97,120.72L76.75,120.84C72.29,123.36 67.51,124.64 62.56,124.64C53.76,124.64 46.62,121.63 41.34,115.68L41.3,115.63C36.54,110.19 34.13,103.15 34.13,94.72C34.13,87.5 36.44,81.01 40.98,75.43L41.23,75.12L41.48,74.83C46.84,68.62 53.54,65.47 62.56,65.47C71.58,65.47 78.82,68.88 84.13,75.62C86.04,71.65 89.25,68.27 93.74,65.52C94.97,64.77 96.45,64.71 97.73,65.34C99.04,66 99.91,67.26 100.05,68.73L100.51,73.51C100.64,74.82 100.16,76.11 99.2,77.03C93.49,82.51 90.71,88.34 90.71,94.86Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> + </group> +</vector> diff --git a/mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.png b/mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.png Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.webp b/mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/beta/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/beta/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/beta/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/beta/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_background.xml b/mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_background.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="432" + android:viewportHeight="432"> + <path + android:pathData="m0,0h432v432h-432z" + android:fillColor="#dcf9ef"/> +</vector> diff --git a/mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_monochrome_foreground.xml b/mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_monochrome_foreground.xml @@ -0,0 +1,18 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="256" + android:viewportHeight="257"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M62.56,111.94C67,111.94 70.72,110.38 73.92,107.17C77.13,103.96 78.68,99.93 78.68,94.86C78.68,90.5 77.04,86.73 73.65,83.34L73.63,83.32C70.34,79.95 66.63,78.31 62.29,78.31C58.59,78.31 55.28,79.9 52.17,83.17C49.12,86.38 47.63,90.16 47.63,94.72C47.63,97.37 47.99,99.8 48.7,101.94C49.48,104.04 50.53,105.88 51.84,107.43C53.11,108.84 54.66,109.98 56.45,110.81C58.27,111.56 60.33,111.94 62.56,111.94Z" + android:fillColor="#4A454E"/> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM90.71,94.86C90.71,102.56 93.36,108.02 98.8,111.54C100.29,112.5 101.06,114.24 100.75,115.96L99.93,120.5C99.68,121.87 98.79,123.03 97.53,123.61C96.29,124.18 94.9,124.11 93.71,123.42C89.35,120.88 86.16,117.89 84.18,114.5C82.28,116.93 79.87,119.01 76.97,120.71L76.97,120.72L76.75,120.84C72.29,123.36 67.51,124.64 62.56,124.64C53.76,124.64 46.62,121.63 41.34,115.68L41.3,115.63C36.54,110.19 34.13,103.15 34.13,94.72C34.13,87.5 36.44,81.01 40.98,75.43L41.23,75.12L41.48,74.83C46.84,68.62 53.54,65.47 62.56,65.47C71.58,65.47 78.82,68.88 84.13,75.62C86.04,71.65 89.25,68.27 93.74,65.52C94.97,64.77 96.45,64.71 97.73,65.34C99.04,66 99.91,67.26 100.05,68.73L100.51,73.51C100.64,74.82 100.16,76.11 99.2,77.03C93.49,82.51 90.71,88.34 90.71,94.86Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> +</vector> 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 @@ -0,0 +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"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_monochrome.xml b/mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_monochrome.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_monochrome_background"/> + <foreground android:drawable="@drawable/ic_launcher_monochrome_foreground"/> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_monochrome_round.xml b/mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_monochrome_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_monochrome_background"/> + <foreground 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 @@ -0,0 +1,5 @@ +<?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"/> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher.webp b/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher.webp b/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/beta/res/values/colors.xml b/mobile/android/fenix/app/src/beta/res/values/colors.xml @@ -4,4 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <color name="ic_launcher_background">@color/photonInk80</color> + <color name="tor_browser_close_tabs_notification_background">#2B8B76</color> </resources> diff --git a/mobile/android/fenix/app/src/beta/res/values/ic_launcher_monochrome_background.xml b/mobile/android/fenix/app/src/beta/res/values/ic_launcher_monochrome_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_launcher_monochrome_background">#FEFBFF</color> +</resources> diff --git a/mobile/android/fenix/app/src/beta/res/values/static_strings.xml b/mobile/android/fenix/app/src/beta/res/values/static_strings.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <!-- Name of the application --> - <string name="app_name" translatable="false">Firefox Beta</string> + <string name="app_name" translatable="false">Tor Browser Alpha</string> </resources> diff --git a/mobile/android/fenix/app/src/beta/res/xml/shortcuts.xml b/mobile/android/fenix/app/src/beta/res/xml/shortcuts.xml @@ -22,7 +22,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.mozilla.firefox_beta" + android:targetPackage="org.torproject.torbrowser_alpha" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> <shortcut @@ -32,7 +32,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.mozilla.firefox_beta" + android:targetPackage="org.torproject.torbrowser_alpha" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> --> diff --git a/mobile/android/fenix/app/src/debug/res/drawable-anydpi/ic_tor_browser_close_tabs_notification.xml b/mobile/android/fenix/app/src/debug/res/drawable-anydpi/ic_tor_browser_close_tabs_notification.xml @@ -0,0 +1,16 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="256" + android:viewportHeight="257" + android:tint="#FFFFFF"> + <group android:scaleX="0.9164202" + android:scaleY="0.92" + android:translateX="10.69821" + android:translateY="10.28"> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM94.04,61.23C94.36,61.18 94.46,60.77 94.2,60.59C89.25,57.25 83.29,55.31 76.87,55.31C59.75,55.31 45.87,69.16 45.87,86.24C45.87,103.33 59.75,117.18 76.87,117.18C84.6,117.18 91.66,114.35 97.09,109.69C97.34,109.48 97.19,109.08 96.86,109.07C83.98,108.56 73.7,97.99 73.7,85.01C73.7,73 82.52,63.04 94.04,61.23Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> +</vector> diff --git a/mobile/android/fenix/app/src/debug/res/drawable-hdpi/fenix_search_widget.png b/mobile/android/fenix/app/src/debug/res/drawable-hdpi/fenix_search_widget.png Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/debug/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/debug/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/debug/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/debug/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_background.xml b/mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_background.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="432" + android:viewportHeight="432"> + <path + android:pathData="M0,0h432v432h-432z" + android:fillColor="#E4E0FA"/> +</vector> diff --git a/mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_monochrome_foreground.xml b/mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_monochrome_foreground.xml @@ -0,0 +1,15 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="256" + android:viewportHeight="257"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM94.04,61.23C94.36,61.18 94.46,60.77 94.2,60.59C89.25,57.25 83.29,55.31 76.87,55.31C59.75,55.31 45.87,69.16 45.87,86.24C45.87,103.33 59.75,117.18 76.87,117.18C84.6,117.18 91.66,114.35 97.09,109.69C97.34,109.48 97.19,109.08 96.86,109.07C83.98,108.56 73.7,97.99 73.7,85.01C73.7,73 82.52,63.04 94.04,61.23Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> +</vector> 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,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - 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"/> + <background android:drawable="@drawable/ic_launcher_background"/> <foreground android:drawable="@drawable/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,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - 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"/> + <background android:drawable="@drawable/ic_launcher_background"/> <foreground android:drawable="@drawable/ic_launcher_foreground"/> </adaptive-icon> diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher.webp b/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher.webp b/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/debug/res/values/colors.xml b/mobile/android/fenix/app/src/debug/res/values/colors.xml @@ -3,5 +3,6 @@ - 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/. --> <resources> - <color name="ic_launcher_background">#9C7AC5</color> + <color name="ic_launcher_background">#220033</color> + <color name="tor_browser_close_tabs_notification_background">#556472</color> </resources> diff --git a/mobile/android/fenix/app/src/debug/res/values/ic_launcher_monochrome_background.xml b/mobile/android/fenix/app/src/debug/res/values/ic_launcher_monochrome_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_launcher_monochrome_background">#FEFBFF</color> +</resources> +\ No newline at end of file diff --git a/mobile/android/fenix/app/src/debug/res/xml/shortcuts.xml b/mobile/android/fenix/app/src/debug/res/xml/shortcuts.xml @@ -22,7 +22,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.mozilla.fenix.debug" + android:targetPackage="org.torproject.torbrowser_debug" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> <shortcut @@ -32,7 +32,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.mozilla.fenix.debug" + android:targetPackage="org.torproject.torbrowser_debug" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> --> diff --git a/mobile/android/fenix/app/src/main/AndroidManifest.xml b/mobile/android/fenix/app/src/main/AndroidManifest.xml @@ -65,7 +65,7 @@ android:allowBackup="false" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/NormalTheme" android:usesCleartextTraffic="false" diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt @@ -37,18 +37,27 @@ class PrivateNotificationService : AbstractPrivateNotificationService() { override val notificationsDelegate: NotificationsDelegate by lazy { components.notificationsDelegate } override fun NotificationCompat.Builder.buildNotification() { - setSmallIcon(R.drawable.ic_private_browsing) + setSmallIcon(R.drawable.ic_tor_browser_close_tabs_notification) val contentTitle = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { - applicationContext.getString(R.string.notification_erase_title_android_14) + applicationContext.getString( + R.string.notification_close_tor_browser_tabs, + applicationContext.getString(R.string.app_name), + ) } else { applicationContext.getString(R.string.app_name_private_4, getString(R.string.app_name)) } val contentText = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { - applicationContext.getString(R.string.notification_erase_text_android_14) + applicationContext.getString( + R.string.notification_close_tor_browser_tabs_long, + applicationContext.getString(R.string.app_name), + ) } else { - applicationContext.getString(R.string.notification_pbm_delete_text_2) + applicationContext.getString( + R.string.notification_close_tor_browser_tabs, + applicationContext.getString(R.string.app_name), + ) } setContentTitle(contentTitle) @@ -56,7 +65,7 @@ class PrivateNotificationService : AbstractPrivateNotificationService() { color = ContextCompat.getColor( this@PrivateNotificationService, - R.color.pbm_notification_color, + R.color.tor_browser_close_tabs_notification_background, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt @@ -185,7 +185,7 @@ class AboutFragment( "" } - val content = getString(R.string.about_content, appName) + val content = getString(R.string.tor_about_content, appName) val buildDate = BuildConfig.BUILD_DATE binding.aboutText.text = aboutText 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, - repository.selectedAppIcon.iconForegroundId, + R.drawable.R.mipmap.ic_launcher, ) val appName = context.getString(R.string.app_name) diff --git a/mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.png b/mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.png Binary files differ. diff --git a/mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.webp b/mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.webp Binary files differ. 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 @@ -19,18 +19,32 @@ <ImageView android:id="@+id/wordmark" - android:layout_width="0dp" - android:layout_height="@dimen/about_header_fenix_logo_height" - android:layout_marginStart="@dimen/about_header_icon_margin_start_end" + android:layout_width="75dp" + android:layout_height="75dp" android:layout_marginTop="@dimen/about_header_icon_margin_top" - android:layout_marginEnd="@dimen/about_header_icon_margin_start_end" + android:layout_marginEnd="130dp" android:contentDescription="@string/app_name" android:importantForAccessibility="no" - app:srcCompat="?fenixLogo" - app:layout_constraintEnd_toEndOf="parent" + app:srcCompat="@mipmap/ic_launcher" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/app_name" + style="@style/Header24TextStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/about_header_icon_margin_top" + android:gravity="center_vertical" + android:width="130dp" + android:height="70dp" + android:lines="2" + android:text="@string/app_name" + android:textSize="20sp" + android:lineSpacingMultiplier="1.2" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_percent="0.75" /> + app:layout_constraintStart_toEndOf="@id/wordmark" /> <TextView android:id="@+id/about_content" @@ -45,7 +59,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/wordmark" app:layout_constraintWidth_percent="0.8" - tools:text="@string/about_content" /> + tools:text="@string/tor_about_content" /> <TextView android:id="@+id/about_text" 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="@drawable/ic_firefox" /> + tools:src="@mipmap/ic_launcher"/> </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="@drawable/ic_firefox" /> + tools:src="@mipmap/ic_launcher" /> </FrameLayout> diff --git a/mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_alternative.xml b/mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_alternative.xml @@ -5,5 +5,5 @@ <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/photonWhite"/> <foreground android:drawable="@drawable/ic_launcher_foreground"/> - <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> + <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/> </adaptive-icon> diff --git a/mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round_alternative.xml b/mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round_alternative.xml @@ -5,5 +5,5 @@ <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/photonWhite"/> <foreground android:drawable="@drawable/ic_launcher_foreground"/> - <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> + <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/> </adaptive-icon> diff --git a/mobile/android/fenix/app/src/main/res/values/ic_launcher_monochrome_background.xml b/mobile/android/fenix/app/src/main/res/values/ic_launcher_monochrome_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_launcher_monochrome_background">#FEFBFF</color> +</resources> +\ No newline at end of file diff --git a/mobile/android/fenix/app/src/main/res/values/static_strings.xml b/mobile/android/fenix/app/src/main/res/values/static_strings.xml @@ -4,8 +4,8 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources xmlns:moz="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> <!-- Name of the application --> - <string name="app_name" translatable="false">Firefox Fenix</string> - <string name="firefox" translatable="false">Firefox</string> + <string name="app_name" translatable="false">Tor Browser Dev</string> + <string name="firefox" translatable="false">Tor Browser</string> <!-- Preference for developers --> <string name="preference_leakcanary" translatable="false">LeakCanary</string> diff --git a/mobile/android/fenix/app/src/main/res/values/styles.xml b/mobile/android/fenix/app/src/main/res/values/styles.xml @@ -548,6 +548,12 @@ <item name="android:fontWeight">@integer/font_weight_medium</item> </style> + <style name="Header24TextStyle" parent="TextAppearance.MaterialComponents.Body1"> + <item name="android:textColor">?textPrimary</item> + <item name="android:textSize">24sp</item> + <item name="fontFamily">@font/metropolis_semibold</item> + </style> + <style name="Header20TextStyle" parent="TextAppearance.MaterialComponents.Body1" tools:ignore="UnusedResources"> <item name="android:textColor">?attr/textPrimary</item> <item name="android:textSize">20sp</item> diff --git a/mobile/android/fenix/app/src/main/res/xml/shortcuts.xml b/mobile/android/fenix/app/src/main/res/xml/shortcuts.xml @@ -22,7 +22,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.mozilla.fenix" + android:targetPackage="org.torproject.torbrowser_dev" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> <shortcut @@ -32,7 +32,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.mozilla.fenix" + android:targetPackage="org.torproject.torbrowser_dev" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> --> diff --git a/mobile/android/fenix/app/src/nightly/ic_launcher-playstore.png b/mobile/android/fenix/app/src/nightly/ic_launcher-playstore.png Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/drawable-anydpi/ic_tor_browser_close_tabs_notification.xml b/mobile/android/fenix/app/src/nightly/res/drawable-anydpi/ic_tor_browser_close_tabs_notification.xml @@ -0,0 +1,21 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="256" + android:viewportHeight="257" + android:tint="#FFFFFF"> + <group android:scaleX="1.84" + android:scaleY="1.84" + android:translateX="-107.52" + android:translateY="-107.94"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM94.04,61.23C94.36,61.18 94.46,60.77 94.2,60.59C89.25,57.25 83.29,55.31 76.87,55.31C59.75,55.31 45.87,69.16 45.87,86.24C45.87,103.33 59.75,117.18 76.87,117.18C84.6,117.18 91.66,114.35 97.09,109.69C97.34,109.48 97.19,109.08 96.86,109.07C83.98,108.56 73.7,97.99 73.7,85.01C73.7,73 82.52,63.04 94.04,61.23Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> + </group> +</vector> diff --git a/mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.png b/mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.png Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.webp b/mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_background.xml b/mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_background.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="432" + android:viewportHeight="432"> + <path + android:pathData="M0,0h432v432h-432z" + android:fillColor="#E4E0FA"/> +</vector> diff --git a/mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_foreground.xml b/mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_foreground.xml @@ -1,205 +0,0 @@ -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - 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/. --> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt" - android:width="108dp" - android:height="108dp" - android:viewportWidth="108" - android:viewportHeight="108"> - <path - android:pathData="M78.127,44.283c-1.132,-2.722 -3.423,-5.661 -5.223,-6.59 1.465,2.872 2.312,5.753 2.636,7.903l0.005,0.043C72.601,38.3 67.61,35.341 63.533,28.898c-0.206,-0.326 -0.412,-0.652 -0.613,-0.997a8.28,8.28 0,0 1,-0.287 -0.539c-0.312,-0.641 -0.388,-1.03 -0.388,-1.03 -0.005,-0.047 -0.028,-0.065 -0.059,-0.07 -0.015,-0.002 -0.029,-0.007 -0.049,0 -0.004,0.001 -0.009,0.006 -0.013,0.007 -0.006,0.002 -0.013,0.007 -0.019,0.01l0.011,-0.015c-6.54,3.831 -8.759,10.917 -8.963,14.463a13.024,13.024 0,0 0,-7.165 2.762,7.8 7.8,0 0,0 -0.674,-0.509c-0.999,-3.375 -0.073,-6.364 -0.073,-6.364 -2.674,1.218 -4.755,3.143 -6.267,4.843h-0.012c-1.032,-1.307 -0.959,-5.62 -0.9,-6.521 -0.012,-0.056 -0.77,0.393 -0.869,0.461a18.998,18.998 0,0 0,-2.544 2.18,22.815 22.815,0 0,0 -2.431,2.916l-0.001,0.004 0.001,-0.004a21.964,21.964 0,0 0,-3.493 7.888l-0.035,0.172a42.912,42.912 0,0 0,-0.256 1.626l-0.006,0.057a24.867,24.867 0,0 0,-0.422 3.593c0,0.044 -0.003,0.088 -0.003,0.133C28,68.344 39.656,80 54.035,80c12.877,0 23.569,-9.349 25.662,-21.63 0.044,-0.333 0.079,-0.668 0.118,-1.004 0.518,-4.465 -0.057,-9.158 -1.688,-13.083zM48.119,64.663c0.122,0.058 0.236,0.122 0.361,0.178a19.081,19.081 0,0 1,-0.361 -0.178zM54.083,48.96zM75.548,45.645a1.772,1.772 0,0 0,-0.003 -0.025l0.004,0.028 -0.001,-0.003z"> - <aapt:attr name="android:fillColor"> - <gradient - android:startY="40.059" - android:startX="77.379" - android:endY="68.436" - android:endX="32.331" - android:type="linear"> - <item android:offset="0" android:color="#FF3FE1B0"/> - <item android:offset="0.406" android:color="#FF00B3F4"/> - <item android:offset="0.42" android:color="#FF03B0F4"/> - <item android:offset="0.818" android:color="#FF5561E9"/> - <item android:offset="1" android:color="#FF7542E5"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M78.127,44.283c-1.132,-2.722 -3.423,-5.661 -5.223,-6.59 1.465,2.872 2.312,5.753 2.636,7.903a0.47,0.47 0,0 0,0.004 0.024l0.004,0.028c2.456,6.66 1.118,13.433 -0.81,17.572 -2.983,6.403 -10.207,12.966 -21.512,12.646C41.01,75.52 30.25,66.455 28.241,54.582c-0.366,-1.872 0,-2.823 0.184,-4.343 -0.224,1.172 -0.31,1.51 -0.422,3.593 0,0.044 -0.003,0.088 -0.003,0.133C28,68.344 39.656,80 54.035,80c12.877,0 23.569,-9.349 25.662,-21.63 0.044,-0.333 0.079,-0.668 0.118,-1.004 0.518,-4.465 -0.057,-9.158 -1.688,-13.083z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="54.279427" - android:centerX="72.3032" - android:centerY="31.889864" - android:type="radial"> - <item android:offset="0.108" android:color="#FF3FE1B0"/> - <item android:offset="0.122" android:color="#FF3BDCB3"/> - <item android:offset="0.254" android:color="#FF1BB3D3"/> - <item android:offset="0.358" android:color="#FF0799E6"/> - <item android:offset="0.42" android:color="#FF0090ED"/> - <item android:offset="0.487" android:color="#FF2482F1"/> - <item android:offset="0.639" android:color="#FF7165FB"/> - <item android:offset="0.71" android:color="#FF9059FF"/> - <item android:offset="0.795" android:color="#FF7D49ED"/> - <item android:offset="0.86" android:color="#FF7542E5"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M78.127,44.283c-1.132,-2.722 -3.423,-5.661 -5.223,-6.59 1.465,2.872 2.312,5.753 2.636,7.903a0.47,0.47 0,0 0,0.004 0.024l0.004,0.028c2.456,6.66 1.118,13.433 -0.81,17.572 -2.983,6.403 -10.207,12.966 -21.512,12.646C41.01,75.52 30.25,66.455 28.241,54.582c-0.366,-1.872 0,-2.823 0.184,-4.343 -0.224,1.172 -0.31,1.51 -0.422,3.593 0,0.044 -0.003,0.088 -0.003,0.133C28,68.344 39.656,80 54.035,80c12.877,0 23.569,-9.349 25.662,-21.63 0.044,-0.333 0.079,-0.668 0.118,-1.004 0.518,-4.465 -0.057,-9.158 -1.688,-13.083z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="54.279427" - android:centerX="52.468304" - android:centerY="54.08076" - android:type="radial"> - <item android:offset="0.3" android:color="#FF45278D"/> - <item android:offset="0.371" android:color="#B062289D"/> - <item android:offset="0.475" android:color="#3C872AB1"/> - <item android:offset="0.53" android:color="#00952BB9"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M65.475,47.343c0.057,0.04 0.109,0.08 0.162,0.119 -0.604,-1.09 -1.396,-2.133 -2.417,-3.154 -8.093,-8.093 -2.122,-17.548 -1.115,-18.029l0.011,-0.015c-6.54,3.831 -8.759,10.917 -8.963,14.463 0.303,-0.021 0.606,-0.047 0.914,-0.047 4.881,0.001 9.132,2.685 11.408,6.663z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="39.323143" - android:centerX="59.01298" - android:centerY="19.571066" - android:type="radial"> - <item android:offset="0.132" android:color="#FF3FE1B0"/> - <item android:offset="0.289" android:color="#FF28D0C8"/> - <item android:offset="0.526" android:color="#FF00B3F4"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M54.084,48.959c-0.043,0.648 -2.331,2.881 -3.131,2.881 -7.403,0 -8.605,4.479 -8.605,4.479 0.328,3.772 2.953,6.877 6.133,8.521a9.771,9.771 0,0 0,0.439 0.21,13.672 13.672,0 0,0 0.765,0.313 11.574,11.574 0,0 0,3.388 0.653c12.976,0.609 15.49,-15.515 6.126,-20.197 2.398,-0.417 4.887,0.547 6.278,1.524 -2.276,-3.978 -6.527,-6.662 -11.408,-6.662 -0.309,0 -0.611,0.025 -0.914,0.047a13.024,13.024 0,0 0,-7.165 2.762c0.397,0.336 0.845,0.785 1.789,1.715 1.764,1.74 6.295,3.543 6.305,3.754z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="25.844818" - android:centerX="46.46577" - android:centerY="68.25843" - android:type="radial"> - <item android:offset="0.287" android:color="#FF0060DF"/> - <item android:offset="0.417" android:color="#FF2357E1"/> - <item android:offset="0.604" android:color="#FF4F4CE3"/> - <item android:offset="0.748" android:color="#FF6B45E4"/> - <item android:offset="0.833" android:color="#FF7542E5"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M54.084,48.959c-0.043,0.648 -2.331,2.881 -3.131,2.881 -7.403,0 -8.605,4.479 -8.605,4.479 0.328,3.772 2.953,6.877 6.133,8.521a9.771,9.771 0,0 0,0.439 0.21,13.672 13.672,0 0,0 0.765,0.313 11.574,11.574 0,0 0,3.388 0.653c12.976,0.609 15.49,-15.515 6.126,-20.197 2.398,-0.417 4.887,0.547 6.278,1.524 -2.276,-3.978 -6.527,-6.662 -11.408,-6.662 -0.309,0 -0.611,0.025 -0.914,0.047a13.024,13.024 0,0 0,-7.165 2.762c0.397,0.336 0.845,0.785 1.789,1.715 1.764,1.74 6.295,3.543 6.305,3.754z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="13.701598" - android:centerX="54.040077" - android:centerY="48.28016" - android:type="radial"> - <item android:offset="0.206" android:color="#0045278D"/> - <item android:offset="0.543" android:color="#5B3C2279"/> - <item android:offset="0.956" android:color="#CC321C64"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M44.773,42.623a33.157,33.157 0,0 1,0.54 0.357c-0.999,-3.375 -0.073,-6.364 -0.073,-6.364 -2.674,1.218 -4.755,3.143 -6.267,4.843 0.125,-0.002 3.901,-0.07 5.8,1.164z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="18.592737" - android:centerX="51.78374" - android:centerY="29.668892" - android:type="radial"> - <item android:offset="0" android:color="#FF00DDFF"/> - <item android:offset="0.235" android:color="#FF00D6FD"/> - <item android:offset="0.572" android:color="#FF00C3F8"/> - <item android:offset="0.792" android:color="#FF00B3F4"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M28.241,54.582C30.25,66.455 41.01,75.52 53.226,75.866c11.306,0.32 18.529,-6.243 21.512,-12.646 1.928,-4.139 3.267,-10.911 0.81,-17.572l-0.001,-0.003a1.772,1.772 0,0 0,-0.003 -0.025c-0.003,-0.019 -0.004,-0.031 -0.004,-0.024l0.005,0.043c0.923,6.031 -2.144,11.873 -6.939,15.824l-0.014,0.034c-9.343,7.609 -18.284,4.591 -20.094,3.355a16.703,16.703 0,0 1,-0.379 -0.189c-5.447,-2.604 -7.698,-7.567 -7.215,-11.824 -4.599,0 -6.168,-3.88 -6.168,-3.88s4.13,-2.945 9.572,-0.384c5.041,2.372 9.775,0.384 9.775,0.384 -0.01,-0.212 -4.541,-2.014 -6.308,-3.755 -0.944,-0.93 -1.392,-1.379 -1.789,-1.715a7.8,7.8 0,0 0,-0.674 -0.509,27.654 27.654,0 0,0 -0.54,-0.357c-1.899,-1.234 -5.675,-1.166 -5.8,-1.163H38.96c-1.032,-1.307 -0.959,-5.62 -0.9,-6.521 -0.012,-0.056 -0.77,0.393 -0.869,0.461a18.998,18.998 0,0 0,-2.544 2.18,22.815 22.815,0 0,0 -2.431,2.916L32.215,40.5l0.001,-0.004a21.964,21.964 0,0 0,-3.493 7.888c-0.014,0.057 -0.938,4.101 -0.482,6.198z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="79.32682" - android:centerX="66.39808" - android:centerY="17.875443" - android:type="radial"> - <item android:offset="0.126" android:color="#FF3FE1B0"/> - <item android:offset="0.429" android:color="#FF00DDFF"/> - <item android:offset="0.479" android:color="#FF1EC1FF"/> - <item android:offset="0.624" android:color="#FF7077FF"/> - <item android:offset="0.69" android:color="#FF9059FF"/> - <item android:offset="0.904" android:color="#FFB833E1"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M63.22,44.308c1.021,1.021 1.813,2.064 2.417,3.154a5.3,5.3 0,0 1,0.391 0.32c5.902,5.439 2.81,13.132 2.579,13.68 4.795,-3.95 7.862,-9.793 6.939,-15.824 -2.945,-7.338 -7.936,-10.297 -12.013,-16.74 -0.206,-0.326 -0.412,-0.652 -0.613,-0.997a8.28,8.28 0,0 1,-0.287 -0.539c-0.312,-0.641 -0.388,-1.03 -0.388,-1.03 -0.005,-0.047 -0.028,-0.065 -0.059,-0.07 -0.015,-0.002 -0.029,-0.007 -0.049,0 -0.004,0.001 -0.009,0.006 -0.013,0.007 -0.006,0.002 -0.013,0.007 -0.019,0.01 -1.007,0.481 -6.978,9.936 1.115,18.029z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="58.109028" - android:centerX="59.84026" - android:centerY="27.248028" - android:type="radial"> - <item android:offset="0" android:color="#FF54FFBD"/> - <item android:offset="0.095" android:color="#FF4CF3B8"/> - <item android:offset="0.197" android:color="#FF3FE1B0"/> - <item android:offset="0.257" android:color="#FF33D8BD"/> - <item android:offset="0.369" android:color="#FF12C0E1"/> - <item android:offset="0.423" android:color="#FF00B3F4"/> - <item android:offset="0.737" android:color="#FF0060DF"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M66.027,47.782a5.3,5.3 0,0 0,-0.391 -0.32c-0.053,-0.04 -0.105,-0.08 -0.162,-0.119 -1.39,-0.977 -3.879,-1.941 -6.278,-1.524 9.364,4.682 6.85,20.806 -6.126,20.197a11.58,11.58 0,0 1,-3.388 -0.653,13.672 13.672,0 0,1 -0.765,-0.313 9.771,9.771 0,0 1,-0.421 -0.199c1.81,1.235 10.751,4.253 20.094,-3.355l0.014,-0.034c0.233,-0.547 3.326,-8.24 -2.577,-13.68z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="49.524426" - android:centerX="51.345055" - android:centerY="36.554844" - android:type="radial"> - <item android:offset="0.137" android:color="#FF3FE1B0"/> - <item android:offset="0.435" android:color="#FF00DDFF"/> - <item android:offset="0.484" android:color="#FF1EC1FF"/> - <item android:offset="0.622" android:color="#FF7077FF"/> - <item android:offset="0.685" android:color="#FF9059FF"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M42.348,56.32s1.202,-4.479 8.605,-4.479c0.8,0 3.088,-2.234 3.131,-2.881 -0.001,0 -4.735,1.988 -9.775,-0.384 -5.443,-2.561 -9.572,0.384 -9.572,0.384s1.568,3.88 6.168,3.88c-0.482,4.257 1.768,9.22 7.215,11.824 0.122,0.058 0.236,0.122 0.361,0.178 -3.18,-1.645 -5.805,-4.751 -6.133,-8.522z"> - <aapt:attr name="android:fillColor"> - <gradient - android:gradientRadius="54.204857" - android:centerX="64.41828" - android:centerY="39.45366" - android:type="radial"> - <item android:offset="0.093" android:color="#FF54FFBD"/> - <item android:offset="0.242" android:color="#FF41F7CC"/> - <item android:offset="0.543" android:color="#FF0FE3F3"/> - <item android:offset="0.625" android:color="#FF00DDFF"/> - </gradient> - </aapt:attr> - </path> - <path - android:pathData="M78.127,44.283c-1.132,-2.722 -3.423,-5.661 -5.223,-6.59 1.465,2.872 2.312,5.753 2.636,7.903l0.005,0.043C72.601,38.3 67.61,35.341 63.533,28.898c-0.206,-0.326 -0.412,-0.652 -0.613,-0.997a8.28,8.28 0,0 1,-0.287 -0.539c-0.312,-0.641 -0.388,-1.03 -0.388,-1.03 -0.005,-0.047 -0.028,-0.065 -0.059,-0.07 -0.015,-0.002 -0.029,-0.007 -0.049,0 -0.004,0.001 -0.009,0.006 -0.013,0.007 -0.006,0.002 -0.013,0.007 -0.019,0.01l0.011,-0.015c-6.54,3.831 -8.759,10.917 -8.963,14.463 0.303,-0.021 0.606,-0.047 0.914,-0.047 4.881,0 9.132,2.684 11.408,6.662 -1.39,-0.977 -3.879,-1.941 -6.278,-1.524 9.364,4.682 6.85,20.806 -6.126,20.197a11.58,11.58 0,0 1,-3.388 -0.653,13.672 13.672,0 0,1 -0.765,-0.313 9.771,9.771 0,0 1,-0.421 -0.199,16.703 16.703,0 0,1 -0.379,-0.189c0.122,0.058 0.236,0.122 0.361,0.178 -3.18,-1.643 -5.805,-4.749 -6.133,-8.521 0,0 1.202,-4.479 8.605,-4.479 0.8,0 3.088,-2.234 3.131,-2.881 -0.01,-0.212 -4.541,-2.014 -6.308,-3.755 -0.944,-0.93 -1.392,-1.379 -1.789,-1.715a7.8,7.8 0,0 0,-0.674 -0.509c-0.999,-3.375 -0.073,-6.364 -0.073,-6.364 -2.674,1.218 -4.755,3.143 -6.267,4.843h-0.012c-1.032,-1.307 -0.959,-5.62 -0.9,-6.521 -0.012,-0.056 -0.77,0.393 -0.869,0.461a18.998,18.998 0,0 0,-2.544 2.18,22.815 22.815,0 0,0 -2.431,2.916l-0.001,0.004 0.001,-0.004a21.964,21.964 0,0 0,-3.493 7.888l-0.035,0.172a43.6,43.6 0,0 0,-0.3 1.642c-0.002,0.019 0.002,-0.019 0,0a30.31,30.31 0,0 0,-0.384 3.633c0,0.044 -0.003,0.088 -0.003,0.133C28,68.344 39.656,80 54.035,80c12.877,0 23.569,-9.349 25.662,-21.63 0.044,-0.333 0.079,-0.668 0.118,-1.004 0.518,-4.465 -0.057,-9.158 -1.688,-13.083zM75.544,45.62l0.004,0.028 -0.001,-0.003a1.772,1.772 0,0 0,-0.003 -0.025z"> - <aapt:attr name="android:fillColor"> - <gradient - android:startY="34.361" - android:startX="74.161" - android:endY="71.137" - android:endX="37.385" - android:type="linear"> - <item android:offset="0.167" android:color="#CC54FFBD"/> - <item android:offset="0.341" android:color="#772BEEDD"/> - <item android:offset="0.5" android:color="#2A0CE2F6"/> - <item android:offset="0.589" android:color="#0000DDFF"/> - </gradient> - </aapt:attr> - </path> -</vector> diff --git a/mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_monochrome_foreground.xml b/mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_monochrome_foreground.xml @@ -0,0 +1,15 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="256" + android:viewportHeight="257"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM94.04,61.23C94.36,61.18 94.46,60.77 94.2,60.59C89.25,57.25 83.29,55.31 76.87,55.31C59.75,55.31 45.87,69.16 45.87,86.24C45.87,103.33 59.75,117.18 76.87,117.18C84.6,117.18 91.66,114.35 97.09,109.69C97.34,109.48 97.19,109.08 96.86,109.07C83.98,108.56 73.7,97.99 73.7,85.01C73.7,73 82.52,63.04 94.04,61.23Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> +</vector> 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 @@ -0,0 +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"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_monochrome.xml b/mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_monochrome.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_monochrome_background"/> + <foreground android:drawable="@drawable/ic_launcher_monochrome_foreground"/> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_monochrome_round.xml b/mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_monochrome_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_monochrome_background"/> + <foreground 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 @@ -0,0 +1,5 @@ +<?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"/> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/nightly/res/values/colors.xml b/mobile/android/fenix/app/src/nightly/res/values/colors.xml @@ -4,4 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <color name="ic_launcher_background">#220033</color> + <color name="tor_browser_close_tabs_notification_background">#3731A1</color> </resources> diff --git a/mobile/android/fenix/app/src/nightly/res/values/ic_launcher_monochrome_background.xml b/mobile/android/fenix/app/src/nightly/res/values/ic_launcher_monochrome_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_launcher_monochrome_background">#FEFBFF</color> +</resources> diff --git a/mobile/android/fenix/app/src/nightly/res/values/static_strings.xml b/mobile/android/fenix/app/src/nightly/res/values/static_strings.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <!-- Name of the application --> - <string name="app_name" translatable="false">Firefox Nightly</string> + <string name="app_name" translatable="false">Tor Browser Nightly</string> </resources> diff --git a/mobile/android/fenix/app/src/nightly/res/xml/shortcuts.xml b/mobile/android/fenix/app/src/nightly/res/xml/shortcuts.xml @@ -22,7 +22,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.mozilla.fenix" + android:targetPackage="org.torproject.torbrowser_nightly" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> <shortcut @@ -32,7 +32,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.mozilla.fenix" + android:targetPackage="org.torproject.torbrowser_nightly" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> --> diff --git a/mobile/android/fenix/app/src/release/ic_launcher-playstore.png b/mobile/android/fenix/app/src/release/ic_launcher-playstore.png Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/drawable-anydpi/ic_tor_browser_close_tabs_notification.xml b/mobile/android/fenix/app/src/release/res/drawable-anydpi/ic_tor_browser_close_tabs_notification.xml @@ -0,0 +1,21 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="256" + android:viewportHeight="257" + android:tint="#FFFFFF"> + <group android:scaleX="1.84" + android:scaleY="1.84" + android:translateX="-107.52" + android:translateY="-107.94"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M256,128.91C256,199.6 198.69,256.91 128,256.91C57.31,256.91 0,199.6 0,128.91C0,58.22 57.31,0.91 128,0.91C198.69,0.91 256,58.22 256,128.91ZM128,23.91C185.99,23.91 233,70.92 233,128.91C233,186.9 185.99,233.91 128,233.91V217.91C177.15,217.91 217,178.06 217,128.91C217,79.75 177.15,39.91 128,39.91V23.91ZM128,63.16C164.31,63.16 193.75,92.6 193.75,128.91C193.75,165.22 164.31,194.66 128,194.66V178.66C155.48,178.66 177.75,156.38 177.75,128.91C177.75,101.43 155.48,79.16 128,79.16V63.16ZM155.25,128.91C155.25,113.86 143.05,101.66 128,101.66V156.16C143.05,156.16 155.25,143.96 155.25,128.91Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> + </group> +</vector> diff --git a/mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.png b/mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.png Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.webp b/mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/release/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/release/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png b/mobile/android/fenix/app/src/release/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/drawable/ic_launcher_background.xml b/mobile/android/fenix/app/src/release/res/drawable/ic_launcher_background.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="432" + android:viewportHeight="432"> + <path + android:pathData="M0,0h432v432h-432z" + android:fillColor="#F1E5FA"/> +</vector> diff --git a/mobile/android/fenix/app/src/release/res/drawable/ic_launcher_monochrome_foreground.xml b/mobile/android/fenix/app/src/release/res/drawable/ic_launcher_monochrome_foreground.xml @@ -0,0 +1,15 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="256" + android:viewportHeight="257"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M256,128.91C256,199.6 198.69,256.91 128,256.91C57.31,256.91 0,199.6 0,128.91C0,58.22 57.31,0.91 128,0.91C198.69,0.91 256,58.22 256,128.91ZM128,23.91C185.99,23.91 233,70.92 233,128.91C233,186.9 185.99,233.91 128,233.91V217.91C177.15,217.91 217,178.06 217,128.91C217,79.75 177.15,39.91 128,39.91V23.91ZM128,63.16C164.31,63.16 193.75,92.6 193.75,128.91C193.75,165.22 164.31,194.66 128,194.66V178.66C155.48,178.66 177.75,156.38 177.75,128.91C177.75,101.43 155.48,79.16 128,79.16V63.16ZM155.25,128.91C155.25,113.86 143.05,101.66 128,101.66V156.16C143.05,156.16 155.25,143.96 155.25,128.91Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> +</vector> 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 @@ -0,0 +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"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_monochrome.xml b/mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_monochrome.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_monochrome_background"/> + <foreground android:drawable="@drawable/ic_launcher_monochrome_foreground"/> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_monochrome_round.xml b/mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_monochrome_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_monochrome_background"/> + <foreground 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 @@ -0,0 +1,5 @@ +<?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"/> +</adaptive-icon> diff --git a/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher.webp b/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher.webp b/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_foreground.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_round.webp b/mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ. diff --git a/mobile/android/fenix/app/src/release/res/values/colors.xml b/mobile/android/fenix/app/src/release/res/values/colors.xml @@ -4,4 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <color name="ic_launcher_background">@color/photonInk80</color> + <color name="tor_browser_close_tabs_notification_background">#701498</color> </resources> diff --git a/mobile/android/fenix/app/src/release/res/values/ic_launcher_monochrome_background.xml b/mobile/android/fenix/app/src/release/res/values/ic_launcher_monochrome_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_launcher_monochrome_background">#FEFBFF</color> +</resources> diff --git a/mobile/android/fenix/app/src/release/res/values/static_strings.xml b/mobile/android/fenix/app/src/release/res/values/static_strings.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <!-- Name of the application --> - <string name="app_name" translatable="false">Firefox</string> + <string name="app_name" translatable="false">Tor Browser</string> </resources> diff --git a/mobile/android/fenix/app/src/release/res/xml/shortcuts.xml b/mobile/android/fenix/app/src/release/res/xml/shortcuts.xml @@ -22,7 +22,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.mozilla.firefox" + android:targetPackage="org.torproject.torbrowser" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> <shortcut @@ -32,7 +32,7 @@ android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2"> <intent android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.mozilla.firefox" + android:targetPackage="org.torproject.torbrowser" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> --> diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/ext/ContextTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/ext/ContextTest.kt @@ -36,7 +36,7 @@ class ContextTest { private lateinit var mockContext: Context private val selectedLocale = Locale.Builder().setLanguage("ro").setRegion("RO").build() - private val appName = "Firefox Preview" + private val appName = "Tor Browser Dev" private val mockId: Int = 11 @@ -53,7 +53,7 @@ class ContextTest { val result = mockContext.getStringWithArgSafe(mockId, appName) - assertEquals("Incearca noul Firefox Preview", result) + assertEquals("Incearca noul Tor Browser Dev", result) } @Test @@ -65,7 +65,7 @@ class ContextTest { val result = mockContext.getStringWithArgSafe(mockId, appName) - assertEquals("Try the new Firefox Preview", result) + assertEquals("Try the new Tor Browser Dev", result) } @Test diff --git a/mobile/android/focus-android/app/src/debug/res/mipmap-anydpi/ic_launcher.xml b/mobile/android/focus-android/app/src/debug/res/mipmap-anydpi/ic_launcher.xml @@ -5,5 +5,5 @@ <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> </adaptive-icon> \ No newline at end of file
