Commits:
25 changed files:
Changes:
mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher.xml
|
1
|
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
2
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
3
|
3
|
<background android:drawable="@drawable/ic_launcher_background"/>
|
|
4
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
|
4
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
5
|
5
|
<monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" />
|
|
6
|
6
|
</adaptive-icon> |
mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_round.xml
|
1
|
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
2
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
3
|
3
|
<background android:drawable="@drawable/ic_launcher_background"/>
|
|
4
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
|
4
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
|
5
|
+ <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/>
|
|
5
|
6
|
</adaptive-icon> |
mobile/android/fenix/app/src/debug/ic_launcher-playstore.png
No preview for this file type
mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher.xml
|
1
|
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
2
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
3
|
3
|
<background android:drawable="@drawable/ic_launcher_background"/>
|
|
4
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
|
4
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
5
|
5
|
<monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" />
|
|
6
|
6
|
</adaptive-icon> |
mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher_round.xml
|
1
|
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
2
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
3
|
3
|
<background android:drawable="@drawable/ic_launcher_background"/>
|
|
4
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
|
4
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
|
5
|
+ <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/>
|
|
5
|
6
|
</adaptive-icon> |
mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp
No preview for this file type
mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp
No preview for this file type
mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp
No preview for this file type
mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp
No preview for this file type
mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
No preview for this file type
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
| ... |
... |
@@ -610,7 +610,7 @@ private fun touPageUIData() = OnboardingPageUiData( |
|
610
|
610
|
lineThreeText = stringResource(id = R.string.onboarding_redesign_tou_body_three),
|
|
611
|
611
|
lineThreeLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_three_link_text),
|
|
612
|
612
|
),
|
|
613
|
|
- imageRes = R.drawable.ic_firefox,
|
|
|
613
|
+ imageRes = R.mipmap.ic_launcher_foreground,
|
|
614
|
614
|
primaryButtonLabel = stringResource(
|
|
615
|
615
|
id = R.string.onboarding_redesign_tou_agree_and_continue_button_label,
|
|
616
|
616
|
),
|
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
| ... |
... |
@@ -232,7 +232,7 @@ private fun OnboardingPagePreview() { |
|
232
|
232
|
lineThreeText = stringResource(id = R.string.onboarding_redesign_tou_body_three),
|
|
233
|
233
|
lineThreeLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_three_link_text),
|
|
234
|
234
|
),
|
|
235
|
|
- imageRes = R.drawable.ic_firefox,
|
|
|
235
|
+ imageRes = R.mipmap.ic_launcher_foreground,
|
|
236
|
236
|
primaryButton = Action(
|
|
237
|
237
|
text = stringResource(
|
|
238
|
238
|
id = R.string.onboarding_redesign_tou_agree_and_continue_button_label,
|
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt
| ... |
... |
@@ -80,7 +80,7 @@ private fun RowScope.BrowserDetailsRow(selected: Boolean = false) { |
|
80
|
80
|
) {
|
|
81
|
81
|
if (selected) {
|
|
82
|
82
|
Image(
|
|
83
|
|
- painter = painterResource(R.drawable.ic_firefox),
|
|
|
83
|
+ painter = painterResource(R.mipmap.ic_launcher_foreground),
|
|
84
|
84
|
contentDescription = null, // Decorative only.
|
|
85
|
85
|
modifier = Modifier.size(24.dp),
|
|
86
|
86
|
)
|
mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
| ... |
... |
@@ -167,7 +167,7 @@ class SearchWidgetProvider : AppWidgetProvider() { |
|
167
|
167
|
// gradient color available for android:fillColor only on SDK 24+
|
|
168
|
168
|
setImageViewResource(
|
|
169
|
169
|
R.id.button_search_widget_new_tab_icon,
|
|
170
|
|
- R.drawable.ic_launcher_foreground,
|
|
|
170
|
+ R.mipmap.ic_launcher_foreground,
|
|
171
|
171
|
)
|
|
172
|
172
|
|
|
173
|
173
|
val appName = context.getString(R.string.app_name)
|
mobile/android/fenix/app/src/main/res/drawable/splash_screen.xml
| ... |
... |
@@ -4,7 +4,7 @@ |
|
4
|
4
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
|
5
|
5
|
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
|
6
|
6
|
<item
|
|
7
|
|
- android:drawable="@drawable/ic_launcher_foreground"
|
|
|
7
|
+ android:drawable="@mipmap/ic_launcher_foreground"
|
|
8
|
8
|
android:width="192dp"
|
|
9
|
9
|
android:height="192dp"
|
|
10
|
10
|
android:gravity="center" />
|
mobile/android/fenix/app/src/main/res/layout/fragment_about.xml
| ... |
... |
@@ -25,7 +25,7 @@ |
|
25
|
25
|
android:layout_marginEnd="130dp"
|
|
26
|
26
|
android:contentDescription="@string/app_name"
|
|
27
|
27
|
android:importantForAccessibility="no"
|
|
28
|
|
- app:srcCompat="@drawable/ic_launcher_foreground"
|
|
|
28
|
+ app:srcCompat="@mipmap/ic_launcher_foreground"
|
|
29
|
29
|
app:layout_constraintStart_toStartOf="parent"
|
|
30
|
30
|
app:layout_constraintEnd_toEndOf="parent"
|
|
31
|
31
|
app:layout_constraintTop_toTopOf="parent" />
|
mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml
| ... |
... |
@@ -139,7 +139,7 @@ |
|
139
|
139
|
android:contentDescription="@string/app_name"
|
|
140
|
140
|
android:scaleX="1.8"
|
|
141
|
141
|
android:scaleY="1.8"
|
|
142
|
|
- app:srcCompat="@drawable/ic_launcher_foreground"
|
|
|
142
|
+ app:srcCompat="@mipmap/ic_launcher_foreground"
|
|
143
|
143
|
android:visibility="gone"
|
|
144
|
144
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
145
|
145
|
app:layout_constraintEnd_toEndOf="parent"
|
mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml
| ... |
... |
@@ -17,7 +17,7 @@ |
|
17
|
17
|
android:layout_gravity="center"
|
|
18
|
18
|
android:contentDescription="@string/search_widget_content_description_2"
|
|
19
|
19
|
android:scaleType="centerInside"
|
|
20
|
|
- tools:src="">"@drawable/ic_launcher_foreground"
|
|
|
20
|
+ tools:src="">"@mipmap/ic_launcher_foreground"
|
|
21
|
21
|
android:scaleX="1.5"
|
|
22
|
22
|
android:scaleY="1.5"/>
|
|
23
|
23
|
|
mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml
| ... |
... |
@@ -17,7 +17,7 @@ |
|
17
|
17
|
android:layout_gravity="center"
|
|
18
|
18
|
android:contentDescription="@string/search_widget_content_description_2"
|
|
19
|
19
|
android:scaleType="centerInside"
|
|
20
|
|
- tools:src="">"@drawable/ic_launcher_foreground"
|
|
|
20
|
+ tools:src="">"@mipmap/ic_launcher_foreground"
|
|
21
|
21
|
android:scaleX="1.5"
|
|
22
|
22
|
android:scaleY="1.5"/>
|
|
23
|
23
|
</FrameLayout> |
mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher.xml
| ... |
... |
@@ -3,7 +3,7 @@ |
|
3
|
3
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
4
|
4
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
|
5
|
5
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
6
|
|
- <background android:drawable="@color/ic_launcher_background"/>
|
|
7
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
8
|
|
- <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
|
|
|
6
|
+ <background android:drawable="@drawable/ic_launcher_background"/>
|
|
|
7
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
|
8
|
+ <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/>
|
|
9
|
9
|
</adaptive-icon> |
mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
| ... |
... |
@@ -3,7 +3,7 @@ |
|
3
|
3
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
4
|
4
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
|
5
|
5
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
6
|
|
- <background android:drawable="@color/ic_launcher_background"/>
|
|
7
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
8
|
|
- <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
|
|
|
6
|
+ <background android:drawable="@drawable/ic_launcher_background"/>
|
|
|
7
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
|
8
|
+ <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/>
|
|
9
|
9
|
</adaptive-icon> |
mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher.xml
|
1
|
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
2
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
3
|
3
|
<background android:drawable="@drawable/ic_launcher_background"/>
|
|
4
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
|
4
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
5
|
5
|
<monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" />
|
|
6
|
6
|
</adaptive-icon> |
mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_round.xml
|
1
|
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
2
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
3
|
3
|
<background android:drawable="@drawable/ic_launcher_background"/>
|
|
4
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
|
4
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
|
5
|
+ <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/>
|
|
5
|
6
|
</adaptive-icon> |
mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher.xml
|
1
|
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
2
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
3
|
3
|
<background android:drawable="@drawable/ic_launcher_background"/>
|
|
4
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
|
4
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
5
|
5
|
<monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" />
|
|
6
|
6
|
</adaptive-icon> |
mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_round.xml
|
1
|
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
2
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
3
|
3
|
<background android:drawable="@drawable/ic_launcher_background"/>
|
|
4
|
|
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
|
|
4
|
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
|
5
|
+ <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/>
|
|
5
|
6
|
</adaptive-icon> |
|