I started working on that yesterday and today and mainly cleaned-up directories. Antonela said she'll help with the mobile icons (thanks!). We need the following ones (taking the official ones as example):
In particular (for each of stable, alpha, and nightly, which we want to have for mobile as well at some point):
72x72 and 144x144 in hdpi
96x96 and 192x192 in xhdpi
144x144 and 288x288 (Mozilla has 300x300 for alpha and nightly icons instead) in xxhdpi
192x192 in xxxhdpi
I attached the three container version available (circle, square large, square small) + all the required display density variables. Let me know if something else is needed.
I attached the three container version available (circle, square large, square small) + all the required display density variables. Let me know if something else is needed.
Which icons should I use for the large versions of the hdpi/xhdpi/xxhdpi icons? And which for the 32x32 and 64x64 favicons? (see comment:10 for all the details, you can click the folders behind the links to check how the Mozilla icons look like)
Additionally, we need at least a set of alpha icons but we want to have nightly ones as well, like for desktop. I thought to ship the next alpha with the alpha series to give the same experience across platforms.
Sure, although that was not my question. :) Mozilla is providing two versions of the icon for hdpi/xhdpi/xxhdpi but you only have one in your assets, See: comment:10 for the large dimensions. I don't know which icons I should use for those. I guess you'd still need to create them? (not sure what to do for the different sizes of the large icon for xxhdpi. Maybe just following Mozilla?)
Added 32x32 and 64x64 favicon, not sure where are they applied on TBA. On desktop, it goes at the URL bar in about:tor but not sure here.
Those icons should be visible on some about pages, see: https://dxr.mozilla.org/mozilla-esr60/search?q=favicon64. However, I've not figured out why this does not seem to work. I guess that's because of one of our patches. It would be nice to have those icons fixed now, though, to have them ready once we tackle the favicon bug (if there is any at all)
Looks good. Should we update the orbot icon at the status bar? Could you share with me the assets it currently has?
I think we don't need to work on that because as I understand it sisbell's work that is blocking the next alpha should get rid of that icon. So, I'd wait for that to land before looking at the Orbot stuff (let me know whether you want to have the assets regardless).
-ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)"+ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha
I'm guessing this isn't an important change.
I'll assume all of the binary changes are okay.
--- 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">
This doesn't seems like the result we want, right? Similarly, I'm guessing mobile/android/branding/alpha/locales/en-US/brand.properties was copied from mobile/android/branding/nightly, should that use the same content as the old torbrowser file?
--- 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
--- /dev/null+++ b/mobile/android/branding/alpha/locales/en-US/brand.properties@@ -0,0 +1,6 @@+# 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=Nightly+brandFullName=Mozilla Nightly
{{{
-ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha
MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)"
+ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha
}}}
I'm guessing this isn't an important change.
No, it's just aligning that file with the layout of the other configure.sh files (those for stable and nightly).
I'll assume all of the binary changes are okay.
{{{
--- 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/. -->
-
-
-
+
+
+
}}}
This doesn't seems like the result we want, right? Similarly, I'm guessing mobile/android/branding/alpha/locales/en-US/brand.properties was copied from mobile/android/branding/nightly, should that use the same content as the old torbrowser file?
Huh, you are right. I am not sure how this happened, sorry for that. I pushed a fixup commit (2ee3e339625a403e6f92618a272264d7353aefdf) on the same branch that should correct this for all supported series, that is stable (aka official), alpha, and nightly. I am following here the desktop lead and don't differentiate the brand names based on series but using the same for all three.
-ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)"+ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha}}}I'm guessing this isn't an important change.
No, it's just aligning that file with the layout of the other configure.sh files (those for stable and nightly).
Okay.
[snip]
This doesn't seems like the result we want, right? Similarly, I'm guessing mobile/android/branding/alpha/locales/en-US/brand.properties was copied from mobile/android/branding/nightly, should that use the same content as the old torbrowser file?
Huh, you are right. I am not sure how this happened, sorry for that. I pushed a fixup commit (2ee3e339625a403e6f92618a272264d7353aefdf) on the same branch that should correct this for all supported series,
Thanks, looks good.
that is stable (aka official), alpha, and nightly. I am following here the desktop lead and don't differentiate the brand names based on series but using the same for all three.
Ah, okay, that was one of my questions. My other question is: Do we want to follow Mozilla's lead with the naming in terms of dropping the "for Android" tag? Looking a little closer at this, it seems Mozilla used "Firefox for Android" only internally, and they branded Fennec as Mozilla Firefox (and Firefox for the short name) externally. I don't have much of a preference here.
Thanks. I've cherry-picked the patches onto tor-browser-60.6.1esr-8.5-1 (commit 099b6fcae28c60e96e7c24fd54ca7da14b00510f and 80e82b14804f677dd89a63a79d42f420ab9ccb7d). And opened a ticket for the "Tor Browser" vs. "Tor Browser for Android" question for 8.5 (#30136 (moved)).
Trac: Status: needs_review to closed Resolution: N/Ato fixed