diff --git a/app/src/debug/res/drawable/ic_launcher_background.png b/app/src/debug/res/drawable/ic_launcher_background.png new file mode 100644 index 000000000000..ed2ce5054ac9 Binary files /dev/null and b/app/src/debug/res/drawable/ic_launcher_background.png differ diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000000..175de321f200 --- /dev/null +++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 33d2231dcf1d..000000000000 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png index a277d7183168..aa0010673b7c 100644 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b88911b22db1..000000000000 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index fb124443ed84..000000000000 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png index 755e7b1306d5..23cf2b0af4af 100644 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index b65a0cb29a31..000000000000 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 73957cc1c447..000000000000 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png index 078dbb4f7542..8d006fc84cae 100644 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 36bc55caadad..000000000000 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9749684e8c22..000000000000 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png index 2fb9c1569259..22aafcf6eb79 100644 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b2dc1375a4bb..000000000000 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index a711e7408ad9..000000000000 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png index fcb3731e2ca3..79df963a9405 100644 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 1fe700b97dfa..000000000000 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-hdpi/ic_logo_wordmark.png deleted file mode 100644 index 3cbdccb49ecc..000000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-mdpi/ic_logo_wordmark.png deleted file mode 100644 index f5b2f5b518ca..000000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-night-xxxhdpi/ic_logo_wordmark.png deleted file mode 100644 index 2d19890d883d..000000000000 Binary files a/app/src/main/res/drawable-night-xxxhdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-night/ic_logo_wordmark_normal.png b/app/src/main/res/drawable-night/ic_logo_wordmark_normal.png new file mode 100644 index 000000000000..cc14001d2597 Binary files /dev/null and b/app/src/main/res/drawable-night/ic_logo_wordmark_normal.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-xhdpi/ic_logo_wordmark.png deleted file mode 100644 index 4225986d02b0..000000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark.png deleted file mode 100644 index 758478a2b38f..000000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_white.png b/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_white.png deleted file mode 100644 index d703de56e3c4..000000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_white.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_logo_wordmark_normal.png b/app/src/main/res/drawable/ic_logo_wordmark_normal.png new file mode 100644 index 000000000000..904f4672f27b Binary files /dev/null and b/app/src/main/res/drawable/ic_logo_wordmark_normal.png differ diff --git a/app/src/main/res/drawable/ic_logo_wordmark_private.png b/app/src/main/res/drawable/ic_logo_wordmark_private.png new file mode 100644 index 000000000000..cc14001d2597 Binary files /dev/null and b/app/src/main/res/drawable/ic_logo_wordmark_private.png differ diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 807ffbd09218..763a150a7e8e 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -18,9 +18,9 @@ android:importantForAccessibility="no" android:src="?fenixLogo" android:layout_marginTop="24dp" - android:layout_height="wrap_content" + android:layout_height="80dp" android:layout_width="0dp" - app:layout_constraintWidth_percent="0.5" + app:layout_constraintWidth_percent="0.75" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e08d902685a8..d4c343a57600 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -39,10 +39,11 @@ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 98a369772d21..000000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index c06b97f21a25..0b098d276d65 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1366889a2ada..000000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 75d5f56d4408..000000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 80713d58672e..8215753e7f2d 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 598ee99491c4..000000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index cb45f301d4c4..000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 9f9bb19103d8..ab5e556cc211 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 1620896d8e05..000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d2820efe1de3..000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 0f434e63d793..8098f60014ef 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index f3e3cb59b8e6..000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index b0a5b167ff67..000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 2de5dd7484ac..dbc835697014 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 5624bd638005..000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml index 6d2f6118e0dc..5fd90c7546b8 100644 --- a/app/src/main/res/values/static_strings.xml +++ b/app/src/main/res/values/static_strings.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - Fenix + Firefox Preview LeakCanary diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e7aa665521cd..16a5394a7764 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,7 +27,7 @@ @color/destructive_normal_theme - @drawable/ic_logo_wordmark + @drawable/ic_logo_wordmark_normal @color/foundation_normal_theme @android:color/transparent @color/primary_text_normal_theme @@ -58,7 +58,7 @@ @color/destructive_private_theme - @drawable/ic_logo_wordmark_white + @drawable/ic_logo_wordmark_private @drawable/private_home_background_gradient @color/accent_private_theme @color/above_private_theme diff --git a/app/src/main/res/xml/home_scene.xml b/app/src/main/res/xml/home_scene.xml index 28372f50e2d0..5e842af7132b 100644 --- a/app/src/main/res/xml/home_scene.xml +++ b/app/src/main/res/xml/home_scene.xml @@ -98,7 +98,7 @@ android:layout_marginTop="16dp" android:alpha="0" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="80dp" android:translationY="-10dp" motion:layout_constraintStart_toStartOf="parent" motion:layout_constraintTop_toTopOf="parent" />