- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 27503: Disabling accessibility on Windows breaks screen readers
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit f5f845f5fe14b5085f919ba46ec092b14c7fcb11 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Apr 2 17:33:09 2019 -0700 Bug 27503: Disabling accessibility on Windows breaks screen readers This patch is merely an application of the current accessibility fixes in Mozilla 1520177 ( https://bugzilla.mozilla.org/show_bug.cgi?id=1520177 ). It replaces the RT_MANIFEST symbol (defined in windows headers we don't include) with the integer constant 24 to avoid includes confusion, updates the IA2Marshall.rc file to explicitly include the dll manifest and it adds some additional include directories previously excluded when building with the mingw toolchain. With this patch applied, the NVDA screen reader can now read webpage contents, though navigation is still broken. --- accessible/interfaces/ia2/IA2Marshal.rc | 1 + toolkit/library/moz.build | 2 +- toolkit/library/xulrunner.rc | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/accessible/interfaces/ia2/IA2Marshal.rc b/accessible/interfaces/ia2/IA2Marshal.rc index b120abce744c..4fd86ddd2ab5 100644 --- a/accessible/interfaces/ia2/IA2Marshal.rc +++ b/accessible/interfaces/ia2/IA2Marshal.rc @@ -3,3 +3,4 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 1 typelib IA2Typelib.tlb +2 24 IA2Marshal.dll.manifest diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build old mode 100644 new mode 100755 index b0df6b98b91f..aeb850bdefba --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -45,7 +45,7 @@ def Libxul(name): if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['ACCESSIBILITY']: LOCAL_INCLUDES += ['!/accessible/interfaces/gecko/'] - if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CC_TYPE'] not in ('clang', 'gcc'): + if CONFIG['OS_ARCH'] == 'WINNT': LOCAL_INCLUDES += [ '/widget/windows', '/xpcom/base', diff --git a/toolkit/library/xulrunner.rc b/toolkit/library/xulrunner.rc index e2adca6e2f1f..29a20c3afc11 100755 --- a/toolkit/library/xulrunner.rc +++ b/toolkit/library/xulrunner.rc @@ -6,8 +6,8 @@ #include "widget.rc" #ifdef ACCESSIBILITY 1 typelib IGeckoCustom.tlb -64 RT_MANIFEST IAccessible64.manifest +64 24 IAccessible64.manifest #ifndef HAVE_64BIT_BUILD -32 RT_MANIFEST IAccessible32.manifest +32 24 IAccessible32.manifest #endif #endif

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29859: Disable HLS support for now
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 477af8c709134b57b530b4b94ce6b4c82cb46fce Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 28 19:10:34 2019 +0000 Bug 29859: Disable HLS support for now --- mobile/android/app/000-tor-browser-android.js | 3 +++ mobile/android/moz.configure | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index de51ec125406..b2ee9d0ded00 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -56,3 +56,6 @@ pref("general.useragent.updates.url", ""); // Enable touch events on Android (highlighting text, etc) pref("dom.w3c_touch_events.enabled", 2); + +// No HLS support for now due to browser freezing, see: #29859. +pref("media.hls.enabled", false); diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index 7033d4283211..d0347b5fe0b8 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -96,7 +96,7 @@ project_flag('MOZ_SWITCHBOARD', project_flag('MOZ_ANDROID_HLS_SUPPORT', help='Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)', - default=True) + default=False) option(env='MOZ_ANDROID_ACTIVITY_STREAM', help='Enable Activity Stream on Android (replacing the default HomePager)',

1 0

[tor-browser-build/master] Merge branch 'bug_28622_v2'
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit bfc677fcd93dc80c062a0dfe3e93115808f09480 Merge: 3ba2100 300c55e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 11 13:57:29 2019 +0000 Merge branch 'bug_28622_v2' projects/firefox/config | 6 +++--- projects/firefox/mozconfig-android-armv7 | 1 - projects/firefox/mozconfig-android-x86 | 1 - 3 files changed, 3 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 28622: Update Tor Browser icon for Android
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 300c55e5e0cf8e24f49959eababd2c7d9fc056ad Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 20 11:11:39 2019 +0000 Bug 28622: Update Tor Browser icon for Android --- projects/firefox/config | 6 +++--- projects/firefox/mozconfig-android-armv7 | 1 - projects/firefox/mozconfig-android-x86 | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 679aaee..bd09c5f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -12,7 +12,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha - branding_directory: browser/branding/alpha + branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential @@ -44,14 +44,14 @@ targets: release: var: torbrowser_update_channel: release - branding_directory: browser/branding/official + branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default - branding_directory: browser/branding/nightly + branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly' android: var: diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index 8cfcc60..dfa3aaf 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -11,7 +11,6 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle ac_add_options --with-android-version=16 -ac_add_options --with-branding=mobile/android/branding/torbrowser # Android NDK does not contain llvm-config so set clang path in options ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64 diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index 1fe0b93..defe5c3 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -11,7 +11,6 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle ac_add_options --with-android-version=16 -ac_add_options --with-branding=mobile/android/branding/torbrowser # Android NDK does not contain llvm-config so set clang path in options ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/lib64

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 28622: Update Tor Browser icon for mobile
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 099b6fcae28c60e96e7c24fd54ca7da14b00510f Author: Georg Koppen <gk(a)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

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28622: Update Tor Browser icon for mobile
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 80e82b14804f677dd89a63a79d42f420ab9ccb7d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 10 20:29:15 2019 +0000 fixup! Bug 28622: Update Tor Browser icon for mobile --- mobile/android/branding/alpha/locales/en-US/brand.dtd | 8 ++++---- mobile/android/branding/alpha/locales/en-US/brand.properties | 4 ++-- mobile/android/branding/nightly/locales/en-US/brand.dtd | 8 ++++---- mobile/android/branding/nightly/locales/en-US/brand.properties | 4 ++-- mobile/android/branding/official/locales/en-US/brand.dtd | 8 ++++---- mobile/android/branding/official/locales/en-US/brand.properties | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mobile/android/branding/alpha/locales/en-US/brand.dtd b/mobile/android/branding/alpha/locales/en-US/brand.dtd index c92ea3503046..01346be36a7c 100644 --- a/mobile/android/branding/alpha/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 "Nightly"> -<!ENTITY brandFullName "Mozilla Nightly"> -<!ENTITY vendorShortName "Mozilla"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY vendorShortName "The Tor Project"> -<!ENTITY brandPocket "Pocket"> +<!ENTITY brandPocket ""> diff --git a/mobile/android/branding/alpha/locales/en-US/brand.properties b/mobile/android/branding/alpha/locales/en-US/brand.properties index d06053614729..12ebf8a5d205 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.properties +++ b/mobile/android/branding/alpha/locales/en-US/brand.properties @@ -2,5 +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/. -brandShortName=Nightly -brandFullName=Mozilla Nightly +brandShortName=Tor Browser +brandFullName=Tor Browser for Android diff --git a/mobile/android/branding/nightly/locales/en-US/brand.dtd b/mobile/android/branding/nightly/locales/en-US/brand.dtd index c92ea3503046..01346be36a7c 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.dtd +++ b/mobile/android/branding/nightly/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 "Nightly"> -<!ENTITY brandFullName "Mozilla Nightly"> -<!ENTITY vendorShortName "Mozilla"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser for Android"> +<!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 d06053614729..12ebf8a5d205 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.properties +++ b/mobile/android/branding/nightly/locales/en-US/brand.properties @@ -2,5 +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/. -brandShortName=Nightly -brandFullName=Mozilla Nightly +brandShortName=Tor Browser +brandFullName=Tor Browser for Android diff --git a/mobile/android/branding/official/locales/en-US/brand.dtd b/mobile/android/branding/official/locales/en-US/brand.dtd index 59009128a273..01346be36a7c 100644 --- a/mobile/android/branding/official/locales/en-US/brand.dtd +++ b/mobile/android/branding/official/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 "Firefox"> -<!ENTITY brandFullName "Mozilla Firefox"> -<!ENTITY vendorShortName "Mozilla"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser for Android"> +<!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 d0203e35a492..12ebf8a5d205 100644 --- a/mobile/android/branding/official/locales/en-US/brand.properties +++ b/mobile/android/branding/official/locales/en-US/brand.properties @@ -2,5 +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/. -brandShortName=Firefox -brandFullName=Mozilla Firefox +brandShortName=Tor Browser +brandFullName=Tor Browser for Android

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29238 - Prevent crash on Android after update
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit bfa54eb8ac5dc923527f07e48d0a390314991fd3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Mar 22 16:24:09 2019 +0000 Bug 29238 - Prevent crash on Android after update --- mobile/android/base/AndroidManifest.xml.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index 01b23d22a19b..c9a65da1ea1f 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -415,14 +415,6 @@ android:name="org.mozilla.gecko.cleanup.FileCleanupService"> </service> - <receiver - android:name="org.mozilla.gecko.PackageReplacedReceiver" - android:exported="false"> - <intent-filter> - <action android:name="android.intent.action.MY_PACKAGE_REPLACED"></action> - </intent-filter> - </receiver> - <service android:name="org.mozilla.gecko.telemetry.TelemetryUploadService" android:exported="false"/>

1 0

[tor-browser-build/master] Bug 29843: Backport the fix for bug 1527534
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit b619af79d04bde9313d8a4a2696c4a5a06c60175 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 21 15:06:04 2019 +0000 Bug 29843: Backport the fix for bug 1527534 --- projects/firefox/1527534.patch | 139 +++++++++++++++++++++++++++++++++++++++++ projects/firefox/build | 6 ++ projects/firefox/config | 2 + 3 files changed, 147 insertions(+) diff --git a/projects/firefox/1527534.patch b/projects/firefox/1527534.patch new file mode 100644 index 0000000..ad8720c --- /dev/null +++ b/projects/firefox/1527534.patch @@ -0,0 +1,139 @@ +From dcd5a0e59bef209aa8301a427b749830876cdada Mon Sep 17 00:00:00 2001 +From: Jeff Gilbert <jgilbert(a)mozilla.com> +Date: Tue, 19 Feb 2019 15:43:39 -0800 +Subject: [PATCH] Bug 1527534 - Reuse LoadApitraceLibrary. r=lsalzman a=lizzard + +Differential Revision: https://phabricator.services.mozilla.com/D20418 + +diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp +index d91d03aee6a9..f4d8c1f80176 100644 +--- a/gfx/gl/GLContextProviderEGL.cpp ++++ b/gfx/gl/GLContextProviderEGL.cpp +@@ -265,11 +265,8 @@ GLContextEGL::~GLContextEGL() { + } + + bool GLContextEGL::Init() { +-#if defined(ANDROID) +- // We can't use LoadApitraceLibrary here because the GLContext +- // expects its own handle to the GL library +- if (!OpenLibrary(APITRACE_LIB)) +-#endif ++ mLibrary = LoadApitraceLibrary(); ++ if (!mLibrary) { + if (!OpenLibrary(GLES2_LIB)) { + #if defined(XP_UNIX) + if (!OpenLibrary(GLES2_LIB2)) { +@@ -278,6 +275,7 @@ bool GLContextEGL::Init() { + } + #endif + } ++ } + + SetupLookupFunction(); + if (!InitWithPrefix("gl", true)) return false; +diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp +index fe4bd9811949..ef693e283968 100644 +--- a/gfx/gl/GLLibraryEGL.cpp ++++ b/gfx/gl/GLLibraryEGL.cpp +@@ -63,9 +63,18 @@ static const char* sEGLExtensionNames[] = { + "EGL_ANGLE_device_creation_d3d11", + }; + +-#if defined(ANDROID) ++PRLibrary* LoadApitraceLibrary() { ++ const char* path = nullptr; ++ ++#ifdef ANDROID ++ // We only need to explicitly dlopen egltrace ++ // on android as we can use LD_PRELOAD or other tricks ++ // on other platforms. We look for it in /data/local ++ // as that's writeable by all users. ++ path = "/data/local/tmp/egltrace.so"; ++#endif ++ if (!path) return nullptr; + +-static PRLibrary* LoadApitraceLibrary() { + // Initialization of gfx prefs here is only needed during the unit tests... + gfxPrefs::GetSingleton(); + if (!gfxPrefs::UseApitrace()) { +@@ -73,7 +82,6 @@ static PRLibrary* LoadApitraceLibrary() { + } + + static PRLibrary* sApitraceLibrary = nullptr; +- + if (sApitraceLibrary) return sApitraceLibrary; + + nsAutoCString logFile; +@@ -87,20 +95,19 @@ static PRLibrary* LoadApitraceLibrary() { + nsAutoCString logPath; + logPath.AppendPrintf("%s/%s", getenv("GRE_HOME"), logFile.get()); + ++#ifndef XP_WIN // Windows is missing setenv and forbids PR_LoadLibrary. + // apitrace uses the TRACE_FILE environment variable to determine where + // to log trace output to + printf_stderr("Logging GL tracing output to %s", logPath.get()); + setenv("TRACE_FILE", logPath.get(), false); + +- printf_stderr("Attempting load of %s\n", APITRACE_LIB); +- +- sApitraceLibrary = PR_LoadLibrary(APITRACE_LIB); ++ printf_stderr("Attempting load of %s\n", path); ++ sApitraceLibrary = PR_LoadLibrary(path); ++#endif + + return sApitraceLibrary; + } + +-#endif // ANDROID +- + #ifdef XP_WIN + // see the comment in GLLibraryEGL::EnsureInitialized() for the rationale here. + static PRLibrary* LoadLibraryForEGLOnWindows(const nsAString& filename) { +diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h +index 069a2f0908d7..3f200bf76b3f 100644 +--- a/gfx/gl/GLLibraryEGL.h ++++ b/gfx/gl/GLLibraryEGL.h +@@ -18,18 +18,6 @@ + #include <bitset> + #include <vector> + +-#ifdef ANDROID +-// We only need to explicitly dlopen egltrace +-// on android as we can use LD_PRELOAD or other tricks +-// on other platforms. We look for it in /data/local +-// as that's writeable by all users +-// +-// This should really go in GLLibraryEGL.cpp but we currently reference +-// APITRACE_LIB in GLContextProviderEGL.cpp. Further refactoring +-// will come in subsequent patches on Bug 732865 +-#define APITRACE_LIB "/data/local/tmp/egltrace.so" +-#endif +- + #if defined(MOZ_X11) + #define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)mozilla::DefaultXDisplay()) + #else +@@ -49,6 +37,7 @@ class DataSourceSurface; + namespace gl { + + class GLContext; ++PRLibrary* LoadApitraceLibrary(); + + void BeforeEGLCall(const char* funcName); + void AfterEGLCall(const char* funcName); +diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h +index b2e094672b59..fae5bec1e78e 100644 +--- a/gfx/thebes/gfxPrefs.h ++++ b/gfx/thebes/gfxPrefs.h +@@ -433,9 +433,7 @@ class gfxPrefs final { + SmoothScrollMSDPhysicsRegularSpringConstant, int32_t, 1000); + + DECL_GFX_PREF(Once, "gfx.android.rgb16.force", AndroidRGB16Force, bool, false); +-#if defined(ANDROID) + DECL_GFX_PREF(Once, "gfx.apitrace.enabled", UseApitrace, bool, false); +-#endif + #if defined(RELEASE_OR_BETA) + // "Skip" means this is locked to the default value in beta and release. + DECL_GFX_PREF(Skip, "gfx.blocklist.all", BlocklistAll, int32_t, 0); +-- +2.20.1 + diff --git a/projects/firefox/build b/projects/firefox/build index 9bc025a..96cba10 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -153,6 +153,12 @@ fi patch -p1 < $rootdir/nsis-uninstall.patch [% END -%] +# Backporting a sec-high bugfix to ESR 60, but making sure it is only applied to +# mobile, as desktop ESR has not seen any testing with this mobile-related patch +[% IF c("var/android") %] + patch -p1 < $rootdir/1527534.patch +[% END -%] + rm -f configure rm -f js/src/configure diff --git a/projects/firefox/config b/projects/firefox/config index 9c85fcb..41f7fbd 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -166,3 +166,5 @@ input_files: - project: firefox-locale-bundle name: firefox-locale-bundle enable: '[% c("var/android") %]' + - filename: 1527534.patch + enable: '[% c("var/android") %]'

1 0

[tor-browser-build/master] Merge branch 'bug_29843'
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 3ba210064197298ad1c54ca74f086a67653109a2 Merge: 516887a b619af7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 11 10:23:30 2019 +0000 Merge branch 'bug_29843' projects/firefox/1527534.patch | 139 +++++++++++++++++++++++++++++++++++++++++ projects/firefox/build | 6 ++ projects/firefox/config | 2 + 3 files changed, 147 insertions(+) diff --cc projects/firefox/config index 9eabf05,41f7fbd..c455d21 --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -166,6 -166,5 +166,8 @@@ input_files - project: firefox-locale-bundle name: firefox-locale-bundle enable: '[% c("var/android") %]' + - project: tba-translation + name: tba-translation + enable: '[% c("var/android") %]' + - filename: 1527534.patch + enable: '[% c("var/android") %]'

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit 8b16afa5b647078a22a862360f4764bce82760ca Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Mar 22 13:43:30 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 29858 - Load onboarding panels after bootstrapping is completed. --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index f8af42f09b5f..dce3dc1548c2 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -1363,10 +1363,10 @@ public class BrowserApp extends GeckoApp if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) { if (mTorNeedsStart) { showTorBootstrapPager(); + } else { + // We can't show the first run experience until Gecko has finished initialization (bug 1077583). + checkFirstrun(this, intent); } - - // We can't show the first run experience until Gecko has finished initialization (bug 1077583). - checkFirstrun(this, intent); } } @@ -3138,6 +3138,11 @@ public class BrowserApp extends GeckoApp // If we finished, then Tor bootstrapped 100% mTorNeedsStart = false; + + // When bootstrapping completes, check if the Firstrun (onboarding) screens + // should be shown. + final SafeIntent intent = new SafeIntent(getIntent()); + checkFirstrun(BrowserApp.this, intent); } }); }

1 0