diff --git a/app/build.gradle b/app/build.gradle index f155199d69..93234bc8c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -108,6 +108,9 @@ android { applicationIdSuffix ".fenix.debug" resValue "bool", "IS_DEBUG", "true" pseudoLocalesEnabled true + // Need to replicate default debug config features + signingConfig signingConfigs.debug + debuggable true } forkRelease releaseTemplate >> { buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" @@ -441,6 +444,7 @@ dependencies { implementation Deps.mozilla_lib_push_firebase implementation Deps.mozilla_lib_dataprotect debugImplementation Deps.leakcanary + forkDebugImplementation Deps.leakcanary implementation Deps.androidx_legacy implementation Deps.androidx_biometric diff --git a/app/src/forkRelease/AndroidManifest.xml b/app/src/forkRelease/AndroidManifest.xml deleted file mode 100644 index 5fdb32de41..0000000000 --- a/app/src/forkRelease/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/forkRelease/res/drawable-hdpi/ic_logo_wordmark_normal.png b/app/src/forkRelease/res/drawable-hdpi/ic_logo_wordmark_normal.png index b3c023ae4d..56c3646c1f 100644 Binary files a/app/src/forkRelease/res/drawable-hdpi/ic_logo_wordmark_normal.png and b/app/src/forkRelease/res/drawable-hdpi/ic_logo_wordmark_normal.png differ diff --git a/app/src/forkRelease/res/drawable-hdpi/ic_logo_wordmark_private.png b/app/src/forkRelease/res/drawable-hdpi/ic_logo_wordmark_private.png index fe14fa16b6..6d2709880c 100644 Binary files a/app/src/forkRelease/res/drawable-hdpi/ic_logo_wordmark_private.png and b/app/src/forkRelease/res/drawable-hdpi/ic_logo_wordmark_private.png differ diff --git a/app/src/forkRelease/res/drawable-mdpi/ic_logo_wordmark_normal.png b/app/src/forkRelease/res/drawable-mdpi/ic_logo_wordmark_normal.png index 0d320ef384..3f573f173e 100644 Binary files a/app/src/forkRelease/res/drawable-mdpi/ic_logo_wordmark_normal.png and b/app/src/forkRelease/res/drawable-mdpi/ic_logo_wordmark_normal.png differ diff --git a/app/src/forkRelease/res/drawable-mdpi/ic_logo_wordmark_private.png b/app/src/forkRelease/res/drawable-mdpi/ic_logo_wordmark_private.png index 2946618268..0d4369bad5 100644 Binary files a/app/src/forkRelease/res/drawable-mdpi/ic_logo_wordmark_private.png and b/app/src/forkRelease/res/drawable-mdpi/ic_logo_wordmark_private.png differ diff --git a/app/src/forkRelease/res/drawable-xhdpi/ic_logo_wordmark_normal.png b/app/src/forkRelease/res/drawable-xhdpi/ic_logo_wordmark_normal.png index 01ccf3b69e..6246820643 100644 Binary files a/app/src/forkRelease/res/drawable-xhdpi/ic_logo_wordmark_normal.png and b/app/src/forkRelease/res/drawable-xhdpi/ic_logo_wordmark_normal.png differ diff --git a/app/src/forkRelease/res/drawable-xhdpi/ic_logo_wordmark_private.png b/app/src/forkRelease/res/drawable-xhdpi/ic_logo_wordmark_private.png index 3275aa8872..afbeef45c8 100644 Binary files a/app/src/forkRelease/res/drawable-xhdpi/ic_logo_wordmark_private.png and b/app/src/forkRelease/res/drawable-xhdpi/ic_logo_wordmark_private.png differ diff --git a/app/src/forkRelease/res/drawable-xxhdpi/ic_logo_wordmark_normal.png b/app/src/forkRelease/res/drawable-xxhdpi/ic_logo_wordmark_normal.png index 46946debd7..1b8b5c17f2 100644 Binary files a/app/src/forkRelease/res/drawable-xxhdpi/ic_logo_wordmark_normal.png and b/app/src/forkRelease/res/drawable-xxhdpi/ic_logo_wordmark_normal.png differ diff --git a/app/src/forkRelease/res/drawable-xxhdpi/ic_logo_wordmark_private.png b/app/src/forkRelease/res/drawable-xxhdpi/ic_logo_wordmark_private.png index 376ec06999..db50378ba4 100644 Binary files a/app/src/forkRelease/res/drawable-xxhdpi/ic_logo_wordmark_private.png and b/app/src/forkRelease/res/drawable-xxhdpi/ic_logo_wordmark_private.png differ diff --git a/app/src/forkRelease/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png b/app/src/forkRelease/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png index f9816dabc9..7949742616 100644 Binary files a/app/src/forkRelease/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png and b/app/src/forkRelease/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png differ diff --git a/app/src/forkRelease/res/drawable-xxxhdpi/ic_logo_wordmark_private.png b/app/src/forkRelease/res/drawable-xxxhdpi/ic_logo_wordmark_private.png index b536c96558..3f377f6410 100644 Binary files a/app/src/forkRelease/res/drawable-xxxhdpi/ic_logo_wordmark_private.png and b/app/src/forkRelease/res/drawable-xxxhdpi/ic_logo_wordmark_private.png differ diff --git a/app/src/forkRelease/res/drawable/ic_launcher_foreground.xml b/app/src/forkRelease/res/drawable/ic_launcher_foreground.xml index b0d7583503..b3fec7e483 100644 --- a/app/src/forkRelease/res/drawable/ic_launcher_foreground.xml +++ b/app/src/forkRelease/res/drawable/ic_launcher_foreground.xml @@ -1,201 +1,184 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/forkRelease/res/mipmap-hdpi/ic_launcher.png b/app/src/forkRelease/res/mipmap-hdpi/ic_launcher.png index 76a1cd0588..4cd0e40756 100644 Binary files a/app/src/forkRelease/res/mipmap-hdpi/ic_launcher.png and b/app/src/forkRelease/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/forkRelease/res/mipmap-hdpi/ic_launcher_round.png b/app/src/forkRelease/res/mipmap-hdpi/ic_launcher_round.png index 4c5f2cea6a..53c557b5d7 100644 Binary files a/app/src/forkRelease/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/forkRelease/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/forkRelease/res/mipmap-mdpi/ic_launcher.png b/app/src/forkRelease/res/mipmap-mdpi/ic_launcher.png index daee591197..4d3610f520 100644 Binary files a/app/src/forkRelease/res/mipmap-mdpi/ic_launcher.png and b/app/src/forkRelease/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/forkRelease/res/mipmap-mdpi/ic_launcher_round.png b/app/src/forkRelease/res/mipmap-mdpi/ic_launcher_round.png index c0d84083f4..903776fdd3 100644 Binary files a/app/src/forkRelease/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/forkRelease/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/forkRelease/res/mipmap-xhdpi/ic_launcher.png b/app/src/forkRelease/res/mipmap-xhdpi/ic_launcher.png index d24517b9e8..eada33642d 100644 Binary files a/app/src/forkRelease/res/mipmap-xhdpi/ic_launcher.png and b/app/src/forkRelease/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/forkRelease/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/forkRelease/res/mipmap-xhdpi/ic_launcher_round.png index dd52139915..ff414b0ac4 100644 Binary files a/app/src/forkRelease/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/forkRelease/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/forkRelease/res/mipmap-xxhdpi/ic_launcher.png b/app/src/forkRelease/res/mipmap-xxhdpi/ic_launcher.png index 144df68387..9997f6831e 100644 Binary files a/app/src/forkRelease/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/forkRelease/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/forkRelease/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/forkRelease/res/mipmap-xxhdpi/ic_launcher_round.png index 772744f4a9..840542e346 100644 Binary files a/app/src/forkRelease/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/forkRelease/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/forkRelease/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/forkRelease/res/mipmap-xxxhdpi/ic_launcher.png index 7f84c8adc7..3723672c9e 100644 Binary files a/app/src/forkRelease/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/forkRelease/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/forkRelease/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/forkRelease/res/mipmap-xxxhdpi/ic_launcher_round.png index d687ae6119..af56fcba6b 100644 Binary files a/app/src/forkRelease/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/forkRelease/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/forkRelease/res/values/colors.xml b/app/src/forkRelease/res/values/colors.xml index 55f8481dcc..d52d5c12f9 100644 --- a/app/src/forkRelease/res/values/colors.xml +++ b/app/src/forkRelease/res/values/colors.xml @@ -3,5 +3,5 @@ - 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/. --> - @color/nightly_launcher_background + #ff20123a diff --git a/app/src/forkRelease/res/values/static_strings.xml b/app/src/forkRelease/res/values/static_strings.xml index 9e477567e5..c13e4d4525 100644 --- a/app/src/forkRelease/res/values/static_strings.xml +++ b/app/src/forkRelease/res/values/static_strings.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - Firefox Nightly + Firefox diff --git a/app/src/forkRelease/res/xml/shortcuts.xml b/app/src/forkRelease/res/xml/shortcuts.xml index e250a89045..3c5234e630 100644 --- a/app/src/forkRelease/res/xml/shortcuts.xml +++ b/app/src/forkRelease/res/xml/shortcuts.xml @@ -2,7 +2,6 @@ -