[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.
From: gk@xxxxxxxxxxxxxx
Date: Sat, 31 Aug 2019 19:46:16 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 31 Aug 2019 15:46:41 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>
commit 00379cae99b3e3188cc7da47486adb5923c5c6bf
Author: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
Date:   Fri Feb 2 17:04:11 2018 +0000

    Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.
    
    Based on Orfox initial commits with fixup commits squashed and
    rebranding Orfox -> Tor Browser
    
    See original source from ce3fab3c90eb4a3892181ee36b037da04c785d99
    https://github.com/guardianproject/tor-browser.git
    
    Dropped symlinks
    
    Also:
    Bug 27125 - Move localized Tor Browser for Android strings into separate file
    Bug 28622: Update Tor Browser icon for mobile
    Bug 27472 - Export MOZILLA_OFFICIAL during Android build
    Bug 30136: Use 'Tor Browser' as brand name on mobile, too
    
    Bug 27111: Configure tor browser for mobile to load about:tor
    
    - Add preferences.json: it is used to configure android specific
    preferences
    
    - Keep the ActivityStream HomePager closed when the user clicks in the
    url bar
---
 .mozconfig-android                                 |  39 +++++++++++++++++++++
 .../base/java/org/mozilla/gecko/BrowserApp.java    |   3 +-
 .../base/locales/en-US/torbrowser_strings.dtd      |   5 +++
 mobile/android/base/moz.build                      |   1 +
 mobile/android/base/strings.xml.in                 |   1 +
 mobile/android/branding/alpha/configure.sh         |   8 +++++
 mobile/android/branding/alpha/content/about.png    | Bin 0 -> 30131 bytes
 .../android/branding/alpha/content/favicon32.png   | Bin 0 -> 1761 bytes
 .../android/branding/alpha/content/favicon64.png   | Bin 0 -> 4950 bytes
 mobile/android/branding/alpha/content/jar.mn       |   9 +++++
 mobile/android/branding/alpha/content/moz.build    |   7 ++++
 .../android/branding/alpha/locales/en-US/brand.dtd |  13 +++++++
 .../branding/alpha/locales/en-US/brand.properties  |  10 ++++++
 mobile/android/branding/alpha/locales/jar.mn       |  13 +++++++
 mobile/android/branding/alpha/locales/moz.build    |   7 ++++
 mobile/android/branding/alpha/moz.build            |   7 ++++
 .../branding/alpha/res/drawable-hdpi/icon.png      | Bin 0 -> 6007 bytes
 .../alpha/res/drawable-hdpi/large_icon.png         | Bin 0 -> 15169 bytes
 .../res/drawable-hdpi/search_widget_preview.png    | Bin 0 -> 10119 bytes
 .../alpha/res/drawable-nodpi/firstrun_welcome.png  | Bin 0 -> 50140 bytes
 .../branding/alpha/res/drawable-xhdpi/icon.png     | Bin 0 -> 8778 bytes
 .../alpha/res/drawable-xhdpi/large_icon.png        | Bin 0 -> 22987 bytes
 .../res/drawable-xhdpi/search_widget_preview.png   | Bin 0 -> 13769 bytes
 .../branding/alpha/res/drawable-xxhdpi/icon.png    | Bin 0 -> 16140 bytes
 .../alpha/res/drawable-xxhdpi/large_icon.png       | Bin 0 -> 41886 bytes
 .../res/drawable-xxhdpi/search_widget_preview.png  | Bin 0 -> 26741 bytes
 .../branding/alpha/res/drawable-xxxhdpi/icon.png   | Bin 0 -> 24683 bytes
 .../res/drawable-xxxhdpi/search_widget_preview.png | Bin 0 -> 34597 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/locales/en-US/brand.dtd       |   8 ++---
 .../nightly/locales/en-US/brand.properties         |   4 +--
 .../branding/nightly/res/drawable-hdpi/icon.png    | Bin 6307 -> 6578 bytes
 .../nightly/res/drawable-hdpi/large_icon.png       | Bin 14582 -> 17085 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 ++--
 .../branding/official/content/favicon32.png        | Bin 2240 -> 2018 bytes
 .../branding/official/content/favicon64.png        | Bin 5324 -> 5527 bytes
 .../branding/official/locales/en-US/brand.dtd      |  10 +++---
 .../official/locales/en-US/brand.properties        |   6 ++--
 .../branding/official/res/drawable-hdpi/icon.png   | Bin 6136 -> 6634 bytes
 .../official/res/drawable-hdpi/large_icon.png      | Bin 14818 -> 17467 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
 .../official/res/drawable-xxxhdpi/icon.png         | Bin 21192 -> 26333 bytes
 .../assets/distribution/preferences.json           |  10 ++++++
 .../mozbuild/action/generate_strings_xml.py        |   3 +-
 .../mozharness/mozilla/testing/testbase.py         |   7 ++--
 55 files changed, 159 insertions(+), 29 deletions(-)

diff --git a/.mozconfig-android b/.mozconfig-android
new file mode 100755
index 000000000000..2a7d75bb252f
--- /dev/null
+++ b/.mozconfig-android
@@ -0,0 +1,39 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --enable-optimize
+ac_add_options --enable-official-branding
+
+# Android
+ac_add_options --enable-application=mobile/android
+ac_add_options --target=arm-linux-androideabi
+ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r17b)
+ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location
+ac_add_options --with-branding=mobile/android/branding/alpha
+
+# Use Mozilla's Clang blobs
+CC="$HOME/.mozbuild/clang/bin/clang"
+CXX="$HOME/.mozbuild/clang/bin/clang++"
+
+ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
+
+#enable ccache to set amount of cache assigned for build.
+ac_add_options --with-ccache
+
+ac_add_options --disable-tor-browser-update
+ac_add_options --disable-signmar
+ac_add_options --disable-verify-mar
+
+ac_add_options --enable-strip
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-rust-debug
+
+ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
+ac_add_options --disable-webrtc
+
+ac_add_options --without-google-play-services
+
+ac_add_options --enable-proxy-bypass-protection
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index a40a5f771373..7d4c03f7e5d2 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -2546,7 +2546,8 @@ public class BrowserApp extends GeckoApp
 
         mBrowserToolbar.startEditing(url, animator);
 
-        showHomePagerWithAnimator(panelId, null, animator);
+        // Don't show the HomePager when entering Edit mode
+        //showHomePagerWithAnimator(panelId, null, animator);
 
         animator.start();
         Telemetry.startUISession(TelemetryContract.Session.AWESOMESCREEN);
diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd b/mobile/android/base/locales/en-US/torbrowser_strings.dtd
new file mode 100644
index 000000000000..d23acc8a033a
--- /dev/null
+++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd
@@ -0,0 +1,5 @@
+<!-- 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/. -->
+
+<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web.">
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 6d8ff304e5c9..8b81dfa97660 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -181,6 +181,7 @@ for f in ['res/values/strings.xml',
         # The `locales/en-US/` will be rewritten to the locale-specific path.
         'locales/en-US/android_strings.dtd',
         'locales/en-US/sync_strings.dtd',
+        'locales/en-US/torbrowser_strings.dtd',
     ]
 
 generated_inputs = [
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 8a64a84c7c45..c328bd6b512a 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -8,6 +8,7 @@
 #includesubst @BRANDPATH@
 #includesubst @STRINGSPATH@
 #includesubst @SYNCSTRINGSPATH@
+#includesubst @TBSTRINGSPATH@
 
 <!-- C-style format strings. -->
 <!ENTITY formatI "&#037;I">
diff --git a/mobile/android/branding/alpha/configure.sh b/mobile/android/branding/alpha/configure.sh
new file mode 100644
index 000000000000..4ec3e9c1041b
--- /dev/null
+++ b/mobile/android/branding/alpha/configure.sh
@@ -0,0 +1,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/.
+
+MOZ_APP_DISPLAYNAME="Tor Browser 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/alpha/content/jar.mn b/mobile/android/branding/alpha/content/jar.mn
new file mode 100644
index 000000000000..9e2365645708
--- /dev/null
+++ b/mobile/android/branding/alpha/content/jar.mn
@@ -0,0 +1,9 @@
+# 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/.
+
+geckoview.jar:
+% 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/alpha/content/moz.build b/mobile/android/branding/alpha/content/moz.build
new file mode 100644
index 000000000000..eb4454d28f88
--- /dev/null
+++ b/mobile/android/branding/alpha/content/moz.build
@@ -0,0 +1,7 @@
+# -*- 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']
\ No newline at end of file
diff --git a/mobile/android/branding/alpha/locales/en-US/brand.dtd b/mobile/android/branding/alpha/locales/en-US/brand.dtd
new file mode 100644
index 000000000000..4d84be3466e9
--- /dev/null
+++ b/mobile/android/branding/alpha/locales/en-US/brand.dtd
@@ -0,0 +1,13 @@
+<!-- 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/. -->
+
+<!ENTITY  brandShortName  "Alpha">
+<!ENTITY  brandFullName   "Tor Browser Alpha">
+<!-- LOCALIZATION NOTE (brandProductName):
+   This brand name can be used in messages where the product name needs to
+   remain unchanged across different versions (Nightly, Beta, etc.). -->
+<!ENTITY  brandProductName "Tor Browser">
+<!ENTITY  vendorShortName "The Tor Project">
+
+<!ENTITY  brandPocket     "">
diff --git a/mobile/android/branding/alpha/locales/en-US/brand.properties b/mobile/android/branding/alpha/locales/en-US/brand.properties
new file mode 100644
index 000000000000..2437e17b4712
--- /dev/null
+++ b/mobile/android/branding/alpha/locales/en-US/brand.properties
@@ -0,0 +1,10 @@
+# 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/.
+
+brandShortName=Alpha
+brandFullName=Tor Browser Alpha
+# LOCALIZATION NOTE(brandProductName):
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+brandProductName=Tor Browser
diff --git a/mobile/android/branding/alpha/locales/jar.mn b/mobile/android/branding/alpha/locales/jar.mn
new file mode 100644
index 000000000000..60454ebba353
--- /dev/null
+++ b/mobile/android/branding/alpha/locales/jar.mn
@@ -0,0 +1,13 @@
+#filter substitution
+# 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/.
+
+[localization] @AB_CD@.jar:
+  branding                         (en-US/**/*.ftl)
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+  locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/alpha/locales/moz.build b/mobile/android/branding/alpha/locales/moz.build
new file mode 100644
index 000000000000..eb4454d28f88
--- /dev/null
+++ b/mobile/android/branding/alpha/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- 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']
\ No newline at end of file
diff --git a/mobile/android/branding/alpha/moz.build b/mobile/android/branding/alpha/moz.build
new file mode 100644
index 000000000000..04084b1ace0f
--- /dev/null
+++ b/mobile/android/branding/alpha/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+DIRS += ['content', 'locales']
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/alpha/res/drawable-hdpi/search_widget_preview.png b/mobile/android/branding/alpha/res/drawable-hdpi/search_widget_preview.png
new file mode 100755
index 000000000000..508b2afc3480
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-hdpi/search_widget_preview.png differ
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/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-xhdpi/search_widget_preview.png b/mobile/android/branding/alpha/res/drawable-xhdpi/search_widget_preview.png
new file mode 100755
index 000000000000..885ca71b454f
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xhdpi/search_widget_preview.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-xxhdpi/search_widget_preview.png b/mobile/android/branding/alpha/res/drawable-xxhdpi/search_widget_preview.png
new file mode 100755
index 000000000000..eab2a3440f2d
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xxhdpi/search_widget_preview.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/alpha/res/drawable-xxxhdpi/search_widget_preview.png b/mobile/android/branding/alpha/res/drawable-xxxhdpi/search_widget_preview.png
new file mode 100755
index 000000000000..d04e82dcb360
Binary files /dev/null and b/mobile/android/branding/alpha/res/drawable-xxxhdpi/search_widget_preview.png differ
diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh
index 69ef1f6b00d0..b4d43eb25a47 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 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/locales/en-US/brand.dtd b/mobile/android/branding/nightly/locales/en-US/brand.dtd
index 0222f39f0016..6eaad721ca94 100644
--- a/mobile/android/branding/nightly/locales/en-US/brand.dtd
+++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd
@@ -3,11 +3,11 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  brandShortName  "Nightly">
-<!ENTITY  brandFullName   "Mozilla Nightly">
+<!ENTITY  brandFullName   "Tor Browser Nightly">
 <!-- LOCALIZATION NOTE (brandProductName):
    This brand name can be used in messages where the product name needs to
    remain unchanged across different versions (Nightly, Beta, etc.). -->
-<!ENTITY  brandProductName "Firefox">
-<!ENTITY  vendorShortName "Mozilla">
+<!ENTITY  brandProductName "Tor Browser">
+<!ENTITY  vendorShortName "The Tor Project">
 
-<!ENTITY  brandPocket     "Pocket">
+<!ENTITY  brandPocket     "">
diff --git a/mobile/android/branding/nightly/locales/en-US/brand.properties b/mobile/android/branding/nightly/locales/en-US/brand.properties
index 32ebbfac4ae4..1279e3752251 100644
--- a/mobile/android/branding/nightly/locales/en-US/brand.properties
+++ b/mobile/android/branding/nightly/locales/en-US/brand.properties
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 brandShortName=Nightly
-brandFullName=Mozilla Nightly
+brandFullName=Tor Browser Nightly
 # LOCALIZATION NOTE(brandProductName):
 # This brand name can be used in messages where the product name needs to
 # remain unchanged across different versions (Nightly, Beta, etc.).
-brandProductName=Firefox
+brandProductName=Tor Browser
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-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..4da3d246d3c5 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"
+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/locales/en-US/brand.dtd b/mobile/android/branding/official/locales/en-US/brand.dtd
index 8942fe3e54d5..248c6567215a 100644
--- a/mobile/android/branding/official/locales/en-US/brand.dtd
+++ b/mobile/android/branding/official/locales/en-US/brand.dtd
@@ -2,12 +2,12 @@
    - 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  "Firefox">
-<!ENTITY  brandFullName   "Mozilla Firefox">
+<!ENTITY  brandShortName  "Tor Browser">
+<!ENTITY  brandFullName   "Tor Browser">
 <!-- LOCALIZATION NOTE (brandProductName):
    This brand name can be used in messages where the product name needs to
    remain unchanged across different versions (Nightly, Beta, etc.). -->
-<!ENTITY  brandProductName "Firefox">
-<!ENTITY  vendorShortName "Mozilla">
+<!ENTITY  brandProductName "Tor Browser">
+<!ENTITY  vendorShortName "The Tor Project">
 
-<!ENTITY  brandPocket     "Pocket">
+<!ENTITY  brandPocket     "">
diff --git a/mobile/android/branding/official/locales/en-US/brand.properties b/mobile/android/branding/official/locales/en-US/brand.properties
index 82cdf6f18c62..34636cab411c 100644
--- a/mobile/android/branding/official/locales/en-US/brand.properties
+++ b/mobile/android/branding/official/locales/en-US/brand.properties
@@ -2,9 +2,9 @@
 # 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/.
 
-brandShortName=Firefox
-brandFullName=Mozilla Firefox
+brandShortName=Tor Browser
+brandFullName=Tor Browser
 # LOCALIZATION NOTE(brandProductName):
 # This brand name can be used in messages where the product name needs to
 # remain unchanged across different versions (Nightly, Beta, etc.).
-brandProductName=Firefox
+brandProductName=Tor Browser
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-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/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json
new file mode 100644
index 000000000000..bebd14967d8e
--- /dev/null
+++ b/mobile/android/torbrowser/assets/distribution/preferences.json
@@ -0,0 +1,10 @@
+{
+  "ApplicationPreferences": {
+    "newtab.load_homepage": true
+  },
+  "AndroidPreferences": {
+    "homepage": "about:tor",
+    "startpane_enabled_after_57": true,
+    "startpane_enabled": true
+  }
+}
diff --git a/python/mozbuild/mozbuild/action/generate_strings_xml.py b/python/mozbuild/mozbuild/action/generate_strings_xml.py
index b60b480f0748..0b3ca6efb229 100644
--- a/python/mozbuild/mozbuild/action/generate_strings_xml.py
+++ b/python/mozbuild/mozbuild/action/generate_strings_xml.py
@@ -11,7 +11,7 @@ import buildconfig
 from mozbuild import preprocessor
 
 
-def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None):
+def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, torbrowser_strings_dtd, locale=None):
     if not locale:
         raise ValueError('locale must be specified!')
 
@@ -23,6 +23,7 @@ def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None
     # Includes.
     defines['STRINGSPATH'] = android_strings_dtd
     defines['SYNCSTRINGSPATH'] = sync_strings_dtd
+    defines['TBSTRINGSPATH'] = torbrowser_strings_dtd
     # Fennec branding is en-US only: see
     # $(MOZ_BRANDING_DIRECTORY)/locales/jar.mn.
     defines['BRANDPATH'] = '{}/{}/locales/en-US/brand.dtd'.format(
diff --git a/testing/mozharness/mozharness/mozilla/testing/testbase.py b/testing/mozharness/mozharness/mozilla/testing/testbase.py
index b392757f7ec1..8fc7fadedf21 100755
--- a/testing/mozharness/mozharness/mozilla/testing/testbase.py
+++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py
@@ -473,8 +473,11 @@ You can set this by specifying --test-url URL
             self._download_test_packages(suite_categories, extract_dirs)
 
         self._download_installer()
-        if self.config.get('download_symbols'):
-            self._download_and_extract_symbols()
+        # When using --disable-crashreporter the symbols file
+        # "target.crashreporter-symbols.zip" won't be created,
+        # so we shouldn't try downloading it (and fail).
+        #if self.config.get('download_symbols'):
+        #    self._download_and_extract_symbols()
 
     # create_virtualenv is in VirtualenvMixin.
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] [tor-browser-build/master] Remove search engines from language packs
Next by Author: [tor-commits] [torbutton/maint-2.1] Translations update
Previous by thread: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 25741 - TBA: Exclude unwanted Stumbler tests
Next by thread: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 25741 - TBA: Disable features at compile-time
Index(es):
- Author
- Thread