Skip to content

Commit

Permalink
For mozilla-mobile#1714: Updates product to Firefox Preview (mozilla-…
Browse files Browse the repository at this point in the history
  • Loading branch information
sblatz authored Apr 23, 2019
1 parent 72410b1 commit 334a3dc
Show file tree
Hide file tree
Showing 46 changed files with 18 additions and 8 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?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="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Binary file removed app/src/debug/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file modified app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
Binary file not shown.
Binary file removed app/src/debug/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file modified app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
Binary file not shown.
Binary file removed app/src/debug/res/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file modified app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
Binary file not shown.
Binary file removed app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
Binary file not shown.
Binary file modified app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file removed app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
Binary file not shown.
Binary file modified app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_logo_wordmark.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_logo_wordmark.png
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-xhdpi/ic_logo_wordmark.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/layout/fragment_home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
<ImageView
android:id="@+id/wordmark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_height="80dp"
android:layout_marginTop="42dp"
android:layout_marginStart="16dp"
android:src="?fenixLogo"
android:adjustViewBounds="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/menuButton" />

Expand Down
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher.png
Diff not rendered.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Diff not rendered.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher.png
Diff not rendered.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Diff not rendered.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher.png
Diff not rendered.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Diff not rendered.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Diff not rendered.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Diff not rendered.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Diff not rendered.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Diff not rendered.
2 changes: 1 addition & 1 deletion app/src/main/res/values/static_strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<resources>
<!-- Name of the application -->
<string name="app_name" translatable="false">Fenix</string>
<string name="app_name" translatable="false">Firefox Preview</string>

<!-- Preference for developers -->
<string name="preference_leakcanary" translatable="false">LeakCanary</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<item name="destructive">@color/destructive_normal_theme</item>

<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark</item>
<item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
<item name="homeBackground">@color/foundation_normal_theme</item>
<item name="privateBrowsingButtonBackground">@android:color/transparent</item>
<item name="privateBrowsingButtonAccent">@color/primary_text_normal_theme</item>
Expand Down Expand Up @@ -58,7 +58,7 @@
<item name="destructive">@color/destructive_private_theme</item>

<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_white</item>
<item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
<item name="homeBackground">@drawable/private_home_background_gradient</item>
<item name="privateBrowsingButtonBackground">@color/accent_private_theme</item>
<item name="privateBrowsingButtonAccent">@color/above_private_theme</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/xml/home_scene.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down

0 comments on commit 334a3dc

Please sign in to comment.