[tor-commits] [tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 28622: Update Tor Browser icon for mobile

gk at torproject.org gk at torproject.org
Thu Apr 11 13:57:11 UTC 2019 

commit 099b6fcae28c60e96e7c24fd54ca7da14b00510f
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Mar 28 15:12:37 2019 +0000

    Bug 28622: Update Tor Browser icon for mobile
    
    We follow the desktop layout by providing icons for stable, alpha, and
    nightly versions in the official, alpha, and nightly branding
    directories, replacing related Firefox icons.
    
    Moreover, this patch adjusts the displayed app name as well according
    to the respective Tor Browser flavor being used.
    
    There is no drawable-mdpi directory in Fennec anymore. Thus, we won't
    ship new icons for that either and we remove the old torbrowser branding
    directory and contents as those are not needed for the new layout.
    
    At some point we could do a proper clean-up of icons we actually don't
    need. For instance, right now we still need to ship the
    firstrun_welcome.png icon from Fennec's onboarding because otherwise
    compilation breaks, even though we have our own, Fennec unrelated
    onboarding. But that's part of a different ticket.
---
 .../branding/{torbrowser => alpha}/configure.sh     |   2 +-
 mobile/android/branding/alpha/content/about.png     | Bin 0 -> 30131 bytes
 mobile/android/branding/alpha/content/favicon32.png | Bin 0 -> 1761 bytes
 mobile/android/branding/alpha/content/favicon64.png | Bin 0 -> 4950 bytes
 .../branding/{torbrowser => alpha}/content/jar.mn   |   2 +-
 .../{torbrowser/locales => alpha/content}/moz.build |   4 ++--
 .../{torbrowser => alpha}/locales/en-US/brand.dtd   |   8 ++++----
 .../locales/en-US/brand.properties}                 |   3 ++-
 .../branding/{torbrowser => alpha}/locales/jar.mn   |   2 +-
 .../{torbrowser/content => alpha/locales}/moz.build |   4 ++--
 .../branding/{torbrowser => alpha}/moz.build        |   2 +-
 .../branding/alpha/res/drawable-hdpi/icon.png       | Bin 0 -> 6007 bytes
 .../branding/alpha/res/drawable-hdpi/large_icon.png | Bin 0 -> 15169 bytes
 .../res/drawable-nodpi/figure_experience.png        | Bin
 .../res/drawable-nodpi/figure_network.png           | Bin
 .../res/drawable-nodpi/figure_onion.png             | Bin
 .../res/drawable-nodpi/figure_privacy.png           | Bin
 .../res/drawable-nodpi/figure_security.png          | Bin
 .../res/drawable-nodpi/figure_welcome.png           | Bin
 .../alpha/res/drawable-nodpi/firstrun_welcome.png   | Bin 0 -> 50140 bytes
 .../drawable-nodpi/home_tab_menu_strip_tor.9.png    | Bin
 .../branding/alpha/res/drawable-xhdpi/icon.png      | Bin 0 -> 8778 bytes
 .../alpha/res/drawable-xhdpi/large_icon.png         | Bin 0 -> 22987 bytes
 .../branding/alpha/res/drawable-xxhdpi/icon.png     | Bin 0 -> 16140 bytes
 .../alpha/res/drawable-xxhdpi/large_icon.png        | Bin 0 -> 41886 bytes
 .../branding/alpha/res/drawable-xxxhdpi/icon.png    | Bin 0 -> 24683 bytes
 mobile/android/branding/nightly/configure.sh        |  10 ++++------
 .../android/branding/nightly/content/favicon32.png  | Bin 2020 -> 1928 bytes
 .../android/branding/nightly/content/favicon64.png  | Bin 5152 -> 5398 bytes
 .../branding/nightly/res/drawable-hdpi/icon.png     | Bin 6307 -> 6578 bytes
 .../nightly/res/drawable-hdpi/large_icon.png        | Bin 14582 -> 17085 bytes
 .../res/drawable-nodpi/figure_experience.png        | Bin 0 -> 44299 bytes
 .../nightly/res/drawable-nodpi/figure_network.png   | Bin 0 -> 70302 bytes
 .../nightly/res/drawable-nodpi/figure_onion.png     | Bin 0 -> 139952 bytes
 .../nightly/res/drawable-nodpi/figure_privacy.png   | Bin 0 -> 61696 bytes
 .../nightly/res/drawable-nodpi/figure_security.png  | Bin 0 -> 52021 bytes
 .../nightly/res/drawable-nodpi/figure_welcome.png   | Bin 0 -> 83798 bytes
 .../drawable-nodpi/home_tab_menu_strip_tor.9.png    | Bin 0 -> 126 bytes
 .../branding/nightly/res/drawable-xhdpi/icon.png    | Bin 9490 -> 9884 bytes
 .../nightly/res/drawable-xhdpi/large_icon.png       | Bin 20843 -> 26206 bytes
 .../branding/nightly/res/drawable-xxhdpi/icon.png   | Bin 16480 -> 18335 bytes
 .../nightly/res/drawable-xxhdpi/large_icon.png      | Bin 36066 -> 49974 bytes
 .../branding/nightly/res/drawable-xxxhdpi/icon.png  | Bin 24541 -> 28434 bytes
 mobile/android/branding/official/configure.sh       |   7 ++-----
 .../android/branding/official/content/favicon32.png | Bin 2240 -> 2018 bytes
 .../android/branding/official/content/favicon64.png | Bin 5324 -> 5527 bytes
 .../branding/official/res/drawable-hdpi/icon.png    | Bin 6136 -> 6634 bytes
 .../official/res/drawable-hdpi/large_icon.png       | Bin 14818 -> 17467 bytes
 .../res/drawable-nodpi/figure_experience.png        | Bin 0 -> 44299 bytes
 .../official/res/drawable-nodpi/figure_network.png  | Bin 0 -> 70302 bytes
 .../official/res/drawable-nodpi/figure_onion.png    | Bin 0 -> 139952 bytes
 .../official/res/drawable-nodpi/figure_privacy.png  | Bin 0 -> 61696 bytes
 .../official/res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes
 .../official/res/drawable-nodpi/figure_welcome.png  | Bin 0 -> 83798 bytes
 .../res/drawable-nodpi/firstrun_welcome.png         | Bin 48391 -> 50140 bytes
 .../drawable-nodpi/home_tab_menu_strip_tor.9.png    | Bin 0 -> 126 bytes
 .../branding/official/res/drawable-xhdpi/icon.png   | Bin 8877 -> 9814 bytes
 .../official/res/drawable-xhdpi/large_icon.png      | Bin 21192 -> 26333 bytes
 .../branding/official/res/drawable-xxhdpi/icon.png  | Bin 14818 -> 17467 bytes
 .../official/res/drawable-xxhdpi/large_icon.png     | Bin 34638 -> 46598 bytes
 .../branding/official/res/drawable-xxxhdpi/icon.png | Bin 21192 -> 26333 bytes
 .../android/branding/torbrowser/content/about.png   | Bin 16858 -> 0 bytes
 .../branding/torbrowser/content/favicon32.png       | Bin 1797 -> 0 bytes
 .../branding/torbrowser/content/favicon64.png       | Bin 3993 -> 0 bytes
 mobile/android/branding/torbrowser/ic_launcher.zip  | Bin 96525 -> 0 bytes
 mobile/android/branding/torbrowser/icon.png         | Bin 36456 -> 0 bytes
 .../torbrowser/locales/en-US/brand.properties       |   7 -------
 .../branding/torbrowser/res/drawable-hdpi/icon.png  | Bin 3549 -> 0 bytes
 .../torbrowser/res/drawable-hdpi/large_icon.png     | Bin 9558 -> 0 bytes
 .../res/drawable-hdpi/launcher_widget.png           | Bin 14001 -> 0 bytes
 .../branding/torbrowser/res/drawable-mdpi/icon.png  | Bin 2577 -> 0 bytes
 .../torbrowser/res/drawable-mdpi/large_icon.png     | Bin 5878 -> 0 bytes
 .../res/drawable-mdpi/launcher_widget.png           | Bin 7661 -> 0 bytes
 .../res/drawable-nodpi/firstrun_welcome.png         | Bin 48391 -> 0 bytes
 .../branding/torbrowser/res/drawable-xhdpi/icon.png | Bin 5878 -> 0 bytes
 .../torbrowser/res/drawable-xhdpi/large_icon.png    | Bin 13553 -> 0 bytes
 .../res/drawable-xhdpi/launcher_widget.png          | Bin 21223 -> 0 bytes
 .../torbrowser/res/drawable-xhdpi/widget_icon.png   | Bin 4381 -> 0 bytes
 .../torbrowser/res/drawable-xxhdpi/icon.png         | Bin 9558 -> 0 bytes
 .../torbrowser/res/drawable-xxhdpi/large_icon.png   | Bin 13553 -> 0 bytes
 .../res/drawable-xxhdpi/launcher_widget.png         | Bin 32686 -> 0 bytes
 .../torbrowser/res/drawable-xxxhdpi/icon.png        | Bin 13553 -> 0 bytes
 mobile/android/branding/torbrowser/torbrowser.png   | Bin 55962 -> 0 bytes
 mobile/android/branding/torbrowser/torbrowser.xcf   | Bin 267775 -> 0 bytes
 84 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/mobile/android/branding/torbrowser/configure.sh b/mobile/android/branding/alpha/configure.sh
similarity index 100%
rename from mobile/android/branding/torbrowser/configure.sh
rename to mobile/android/branding/alpha/configure.sh
index 5e2dbfc15cf9..1fd6385c5a06 100644
--- a/mobile/android/branding/torbrowser/configure.sh
+++ b/mobile/android/branding/alpha/configure.sh
@@ -2,7 +2,7 @@
 # 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/.
 
-ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha
 MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)"
+ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha
 MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=
diff --git a/mobile/android/branding/alpha/content/about.png b/mobile/android/branding/alpha/content/about.png
new file mode 100644
index 000000000000..2ca32a355fcd
Binary files /dev/null and b/mobile/android/branding/alpha/content/about.png differ
diff --git a/mobile/android/branding/alpha/content/favicon32.png b/mobile/android/branding/alpha/content/favicon32.png
new file mode 100644
index 000000000000..f3183767da37
Binary files /dev/null and b/mobile/android/branding/alpha/content/favicon32.png differ
diff --git a/mobile/android/branding/alpha/content/favicon64.png b/mobile/android/branding/alpha/content/favicon64.png
new file mode 100644
index 000000000000..56831e8ad596
Binary files /dev/null and b/mobile/android/branding/alpha/content/favicon64.png differ
diff --git a/mobile/android/branding/torbrowser/content/jar.mn b/mobile/android/branding/alpha/content/jar.mn
similarity index 87%
rename from mobile/android/branding/torbrowser/content/jar.mn
rename to mobile/android/branding/alpha/content/jar.mn
index f934ed5e4634..e49cc40416a0 100644
--- a/mobile/android/branding/torbrowser/content/jar.mn
+++ b/mobile/android/branding/alpha/content/jar.mn
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
-% content branding %content/branding/
+% content branding %content/branding/ contentaccessible=yes
   content/branding/about.png                     (about.png)
   content/branding/favicon32.png                 (favicon32.png)
   content/branding/favicon64.png                 (favicon64.png)
diff --git a/mobile/android/branding/torbrowser/locales/moz.build b/mobile/android/branding/alpha/content/moz.build
similarity index 67%
rename from mobile/android/branding/torbrowser/locales/moz.build
rename to mobile/android/branding/alpha/content/moz.build
index 3bbe6729759c..eb4454d28f88 100644
--- a/mobile/android/branding/torbrowser/locales/moz.build
+++ b/mobile/android/branding/alpha/content/moz.build
@@ -1,7 +1,7 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.dtd b/mobile/android/branding/alpha/locales/en-US/brand.dtd
similarity index 55%
rename from mobile/android/branding/torbrowser/locales/en-US/brand.dtd
rename to mobile/android/branding/alpha/locales/en-US/brand.dtd
index 01346be36a7c..c92ea3503046 100644
--- a/mobile/android/branding/torbrowser/locales/en-US/brand.dtd
+++ b/mobile/android/branding/alpha/locales/en-US/brand.dtd
@@ -2,8 +2,8 @@
    - 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/. -->
 
-<!ENTITY  brandShortName  "Tor Browser">
-<!ENTITY  brandFullName   "Tor Browser for Android">
-<!ENTITY  vendorShortName "The Tor Project">
+<!ENTITY  brandShortName  "Nightly">
+<!ENTITY  brandFullName   "Mozilla Nightly">
+<!ENTITY  vendorShortName "Mozilla">
 
-<!ENTITY  brandPocket     "">
+<!ENTITY  brandPocket     "Pocket">
diff --git a/mobile/android/branding/torbrowser/locales/Makefile.in b/mobile/android/branding/alpha/locales/en-US/brand.properties
similarity index 79%
rename from mobile/android/branding/torbrowser/locales/Makefile.in
rename to mobile/android/branding/alpha/locales/en-US/brand.properties
index 82f614ecea29..d06053614729 100644
--- a/mobile/android/branding/torbrowser/locales/Makefile.in
+++ b/mobile/android/branding/alpha/locales/en-US/brand.properties
@@ -2,4 +2,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/.
 
-DEFINES += -DAB_CD=$(AB_CD)
+brandShortName=Nightly
+brandFullName=Mozilla Nightly
diff --git a/mobile/android/branding/torbrowser/locales/jar.mn b/mobile/android/branding/alpha/locales/jar.mn
similarity index 86%
rename from mobile/android/branding/torbrowser/locales/jar.mn
rename to mobile/android/branding/alpha/locales/jar.mn
index 825dabbfb470..5a77695c91aa 100644
--- a/mobile/android/branding/torbrowser/locales/jar.mn
+++ b/mobile/android/branding/alpha/locales/jar.mn
@@ -8,4 +8,4 @@
 % locale branding @AB_CD@ %locale/branding/
 # Nightly branding only exists in en-US
   locale/branding/brand.dtd        (en-US/brand.dtd)
-* locale/branding/brand.properties (en-US/brand.properties)
+  locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/torbrowser/content/moz.build b/mobile/android/branding/alpha/locales/moz.build
similarity index 67%
rename from mobile/android/branding/torbrowser/content/moz.build
rename to mobile/android/branding/alpha/locales/moz.build
index 3bbe6729759c..eb4454d28f88 100644
--- a/mobile/android/branding/torbrowser/content/moz.build
+++ b/mobile/android/branding/alpha/locales/moz.build
@@ -1,7 +1,7 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/mobile/android/branding/torbrowser/moz.build b/mobile/android/branding/alpha/moz.build
similarity index 76%
rename from mobile/android/branding/torbrowser/moz.build
rename to mobile/android/branding/alpha/moz.build
index 8f320daeae90..04084b1ace0f 100644
--- a/mobile/android/branding/torbrowser/moz.build
+++ b/mobile/android/branding/alpha/moz.build
@@ -1,4 +1,4 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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
diff --git a/mobile/android/branding/alpha/res/drawable-hdpi/icon.png b/mobile/android/branding/alpha/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000000..4b8a5d2e48b6
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-hdpi/icon.png differ
diff --git a/mobile/android/branding/alpha/res/drawable-hdpi/large_icon.png b/mobile/android/branding/alpha/res/drawable-hdpi/large_icon.png
new file mode 100644
index 000000000000..50f8777fc058
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-hdpi/large_icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_experience.png
similarity index 100%
rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png
rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_experience.png
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_network.png
similarity index 100%
rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png
rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_network.png
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_onion.png
similarity index 100%
rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png
rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_onion.png
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_privacy.png
similarity index 100%
rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png
rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_privacy.png
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_security.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_security.png
similarity index 100%
rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_security.png
rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_security.png
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/alpha/res/drawable-nodpi/figure_welcome.png
similarity index 100%
rename from mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png
rename to mobile/android/branding/alpha/res/drawable-nodpi/figure_welcome.png
diff --git a/mobile/android/branding/alpha/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/alpha/res/drawable-nodpi/firstrun_welcome.png
new file mode 100644
index 000000000000..5c9093331cff
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-nodpi/firstrun_welcome.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/alpha/res/drawable-nodpi/home_tab_menu_strip_tor.9.png
similarity index 100%
rename from mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png
rename to mobile/android/branding/alpha/res/drawable-nodpi/home_tab_menu_strip_tor.9.png
diff --git a/mobile/android/branding/alpha/res/drawable-xhdpi/icon.png b/mobile/android/branding/alpha/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000000..1bae7fa5fe70
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xhdpi/icon.png differ
diff --git a/mobile/android/branding/alpha/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/alpha/res/drawable-xhdpi/large_icon.png
new file mode 100644
index 000000000000..371a1734d87c
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xhdpi/large_icon.png differ
diff --git a/mobile/android/branding/alpha/res/drawable-xxhdpi/icon.png b/mobile/android/branding/alpha/res/drawable-xxhdpi/icon.png
new file mode 100644
index 000000000000..df944c11d700
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xxhdpi/icon.png differ
diff --git a/mobile/android/branding/alpha/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/alpha/res/drawable-xxhdpi/large_icon.png
new file mode 100644
index 000000000000..5e9bc0036a0d
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xxhdpi/large_icon.png differ
diff --git a/mobile/android/branding/alpha/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/alpha/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 000000000000..88005f727968
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xxxhdpi/icon.png differ
diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh
index 69ef1f6b00d0..47761caf31f4 100644
--- a/mobile/android/branding/nightly/configure.sh
+++ b/mobile/android/branding/nightly/configure.sh
@@ -2,9 +2,7 @@
 # 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/.
 
-MOZ_APP_DISPLAYNAME="Firefox Nightly"
-MOZ_UPDATER=1
-MOZ_ANDROID_ANR_REPORTER=1
-MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
-MOZ_ANDROID_GCM_SENDERID=965234145045
-MOZ_MMA_GCM_SENDERID=242693410970
\ No newline at end of file
+MOZ_APP_DISPLAYNAME="Tor Browser for Android (Nightly)"
+ANDROID_PACKAGE_NAME=org.torproject.torbrowser_nightly
+MOZ_UPDATER=
+MOZ_ANDROID_ANR_REPORTER=
diff --git a/mobile/android/branding/nightly/content/favicon32.png b/mobile/android/branding/nightly/content/favicon32.png
index 23830c03fcd5..1331164c81f0 100644
Binary files a/mobile/android/branding/nightly/content/favicon32.png and b/mobile/android/branding/nightly/content/favicon32.png differ
diff --git a/mobile/android/branding/nightly/content/favicon64.png b/mobile/android/branding/nightly/content/favicon64.png
index d2214dcefe9a..eae8d730594e 100644
Binary files a/mobile/android/branding/nightly/content/favicon64.png and b/mobile/android/branding/nightly/content/favicon64.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/icon.png
index 68e024ad268a..756d37856e19 100644
Binary files a/mobile/android/branding/nightly/res/drawable-hdpi/icon.png and b/mobile/android/branding/nightly/res/drawable-hdpi/icon.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png
index 2ffc0ca909b9..6ce99c3a2124 100644
Binary files a/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png and b/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_experience.png
new file mode 100644
index 000000000000..2eeeb1ccbd7d
Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_experience.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_network.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_network.png
new file mode 100644
index 000000000000..62bf5e2d144d
Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_network.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_onion.png
new file mode 100644
index 000000000000..cbd8236f82e9
Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_onion.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_privacy.png
new file mode 100644
index 000000000000..d9d56229aa8a
Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_privacy.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_security.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_security.png
new file mode 100644
index 000000000000..0a0d47f75370
Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_security.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/nightly/res/drawable-nodpi/figure_welcome.png
new file mode 100644
index 000000000000..274dea5c31a6
Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/figure_welcome.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/nightly/res/drawable-nodpi/home_tab_menu_strip_tor.9.png
new file mode 100644
index 000000000000..a92420d11b8e
Binary files /dev/null and b/mobile/android/branding/nightly/res/drawable-nodpi/home_tab_menu_strip_tor.9.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
index 0b5e1a175255..03fe48da2707 100644
Binary files a/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png and b/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png
index 12f87594365c..f54c241c56eb 100644
Binary files a/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png and b/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
index 1ee12f2419eb..1288d3f106b0 100644
Binary files a/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png and b/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png
index 37ac9d067e92..f5ffff4cd6b1 100644
Binary files a/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png and b/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png
index 9128552b390e..d7d3f99c1d2c 100644
Binary files a/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png and b/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png differ
diff --git a/mobile/android/branding/official/configure.sh b/mobile/android/branding/official/configure.sh
index 5687537d358e..aa8b56336ccc 100644
--- a/mobile/android/branding/official/configure.sh
+++ b/mobile/android/branding/official/configure.sh
@@ -2,10 +2,7 @@
 # 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/.
 
-MOZ_APP_DISPLAYNAME=Firefox
-ANDROID_PACKAGE_NAME=org.mozilla.firefox
+MOZ_APP_DISPLAYNAME="Tor Browser for Android"
+ANDROID_PACKAGE_NAME=org.torproject.torbrowser
 MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=
-MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
-MOZ_ANDROID_GCM_SENDERID=965234145045
-MOZ_MMA_GCM_SENDERID=242693410970
\ No newline at end of file
diff --git a/mobile/android/branding/official/content/favicon32.png b/mobile/android/branding/official/content/favicon32.png
index b6eb66068725..06992a00bc3e 100644
Binary files a/mobile/android/branding/official/content/favicon32.png and b/mobile/android/branding/official/content/favicon32.png differ
diff --git a/mobile/android/branding/official/content/favicon64.png b/mobile/android/branding/official/content/favicon64.png
index 1a8fc1ad0a65..4ef62a9617df 100644
Binary files a/mobile/android/branding/official/content/favicon64.png and b/mobile/android/branding/official/content/favicon64.png differ
diff --git a/mobile/android/branding/official/res/drawable-hdpi/icon.png b/mobile/android/branding/official/res/drawable-hdpi/icon.png
index 370202c13fc7..8211871aae67 100644
Binary files a/mobile/android/branding/official/res/drawable-hdpi/icon.png and b/mobile/android/branding/official/res/drawable-hdpi/icon.png differ
diff --git a/mobile/android/branding/official/res/drawable-hdpi/large_icon.png b/mobile/android/branding/official/res/drawable-hdpi/large_icon.png
index 1815e0cabea9..bb81f8772b6d 100644
Binary files a/mobile/android/branding/official/res/drawable-hdpi/large_icon.png and b/mobile/android/branding/official/res/drawable-hdpi/large_icon.png differ
diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/official/res/drawable-nodpi/figure_experience.png
new file mode 100644
index 000000000000..2eeeb1ccbd7d
Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_experience.png differ
diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_network.png b/mobile/android/branding/official/res/drawable-nodpi/figure_network.png
new file mode 100644
index 000000000000..62bf5e2d144d
Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_network.png differ
diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/official/res/drawable-nodpi/figure_onion.png
new file mode 100644
index 000000000000..cbd8236f82e9
Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_onion.png differ
diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/official/res/drawable-nodpi/figure_privacy.png
new file mode 100644
index 000000000000..d9d56229aa8a
Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_privacy.png differ
diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_security.png b/mobile/android/branding/official/res/drawable-nodpi/figure_security.png
new file mode 100644
index 000000000000..0a0d47f75370
Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_security.png differ
diff --git a/mobile/android/branding/official/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/official/res/drawable-nodpi/figure_welcome.png
new file mode 100644
index 000000000000..274dea5c31a6
Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/figure_welcome.png differ
diff --git a/mobile/android/branding/official/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/official/res/drawable-nodpi/firstrun_welcome.png
index e4e84187e891..5c9093331cff 100644
Binary files a/mobile/android/branding/official/res/drawable-nodpi/firstrun_welcome.png and b/mobile/android/branding/official/res/drawable-nodpi/firstrun_welcome.png differ
diff --git a/mobile/android/branding/official/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/official/res/drawable-nodpi/home_tab_menu_strip_tor.9.png
new file mode 100644
index 000000000000..a92420d11b8e
Binary files /dev/null and b/mobile/android/branding/official/res/drawable-nodpi/home_tab_menu_strip_tor.9.png differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/icon.png b/mobile/android/branding/official/res/drawable-xhdpi/icon.png
index 6da9415761f0..39195e143042 100644
Binary files a/mobile/android/branding/official/res/drawable-xhdpi/icon.png and b/mobile/android/branding/official/res/drawable-xhdpi/icon.png differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png
index 3094479498bb..25d490e2fc0e 100644
Binary files a/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png and b/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/icon.png
index 1815e0cabea9..bb81f8772b6d 100644
Binary files a/mobile/android/branding/official/res/drawable-xxhdpi/icon.png and b/mobile/android/branding/official/res/drawable-xxhdpi/icon.png differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png
index 0e2f73cb2ad4..d03e22132ffb 100644
Binary files a/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png and b/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png differ
diff --git a/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png
index 3094479498bb..25d490e2fc0e 100644
Binary files a/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png and b/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png differ
diff --git a/mobile/android/branding/torbrowser/content/about.png b/mobile/android/branding/torbrowser/content/about.png
deleted file mode 100644
index 3819f6337a17..000000000000
Binary files a/mobile/android/branding/torbrowser/content/about.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/content/favicon32.png b/mobile/android/branding/torbrowser/content/favicon32.png
deleted file mode 100644
index 0c414d6ca46b..000000000000
Binary files a/mobile/android/branding/torbrowser/content/favicon32.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/content/favicon64.png b/mobile/android/branding/torbrowser/content/favicon64.png
deleted file mode 100644
index bfc9e05538c6..000000000000
Binary files a/mobile/android/branding/torbrowser/content/favicon64.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/ic_launcher.zip b/mobile/android/branding/torbrowser/ic_launcher.zip
deleted file mode 100644
index 69601344519e..000000000000
Binary files a/mobile/android/branding/torbrowser/ic_launcher.zip and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/icon.png b/mobile/android/branding/torbrowser/icon.png
deleted file mode 100644
index 6e0051b95a32..000000000000
Binary files a/mobile/android/branding/torbrowser/icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.properties b/mobile/android/branding/torbrowser/locales/en-US/brand.properties
deleted file mode 100644
index 3015d2376518..000000000000
--- a/mobile/android/branding/torbrowser/locales/en-US/brand.properties
+++ /dev/null
@@ -1,7 +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/.
-
-#filter
-brandShortName=Tor Browser
-brandFullName=Tor Browser for Android
diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png
deleted file mode 100644
index 2a1dc9aea83d..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png
deleted file mode 100644
index 946e03e42d0b..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png
deleted file mode 100644
index 4d7dc659a565..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png
deleted file mode 100644
index 78ace1c9b6d3..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png
deleted file mode 100644
index 8e45a100870b..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png
deleted file mode 100644
index 23d966478fdf..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png
deleted file mode 100644
index e4e84187e891..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 8e45a100870b..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png
deleted file mode 100644
index d3a4929e7503..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png
deleted file mode 100644
index beff04f1fc1d..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png
deleted file mode 100644
index ef76eb342035..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index 946e03e42d0b..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png
deleted file mode 100644
index d3a4929e7503..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png
deleted file mode 100644
index 279af3fff38b..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png
deleted file mode 100644
index d3a4929e7503..000000000000
Binary files a/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/torbrowser.png b/mobile/android/branding/torbrowser/torbrowser.png
deleted file mode 100644
index 6c6d906aa044..000000000000
Binary files a/mobile/android/branding/torbrowser/torbrowser.png and /dev/null differ
diff --git a/mobile/android/branding/torbrowser/torbrowser.xcf b/mobile/android/branding/torbrowser/torbrowser.xcf
deleted file mode 100644
index 2a8f829c3c34..000000000000
Binary files a/mobile/android/branding/torbrowser/torbrowser.xcf and /dev/null differ

More information about the tor-commits mailing list