Fix Bug 1118339 - Update https://www.mozilla.org/en-US/firefox/channel/#aurora for Android ARM links to reflect new FTP directory changes

Author: kyoshino

bedrock/mozorg/helpers/download_buttons.py

@@ -31,8 +31,10 @@
     'direct': 'https://download.mozilla.org/',
     'aurora': nightly_desktop,
     'aurora-l10n': nightly_desktop + '-l10n',
-    'aurora-android-armv7': nightly_android + (
-        '/en-US/fennec-%s.en-US.android-arm.apk'),
+    'aurora-android-api-9': nightly_android + (
+        '-api-9/fennec-%s.multi.android-arm.apk'),
+    'aurora-android-api-11': nightly_android + (
+        '-api-11/fennec-%s.multi.android-arm.apk'),
     'aurora-android-x86': nightly_android + (
         '-x86/fennec-%s.multi.android-i386.apk'),
 }
@@ -128,22 +130,26 @@ def make_download_link(product, build, version, platform, locale,
 def android_builds(build, builds=None):
     builds = builds or []
     android_link = settings.GOOGLE_PLAY_FIREFOX_LINK
+    variations = {
+        'api-9': 'Gingerbread',
+        'api-11': 'Honeycomb+ ARMv7',
+        'x86': 'x86',
+    }
 
     if build.lower() == 'beta':
 
         android_link = android_link.replace('org.mozilla.firefox',
                                             'org.mozilla.firefox_beta')
 
     if build == 'aurora':
-        for arch_pretty in ['ARMv7', 'x86']:
-            arch = arch_pretty.lower()
-            link = (download_urls['aurora-android-%s' % arch] %
+        for type, arch_pretty in variations.items():
+            link = (download_urls['aurora-android-%s' % type] %
                     mobile_details.latest_version('aurora'))
 
             builds.append({'os': 'os_android',
                            'os_pretty': 'Android',
                            'os_arch_pretty': 'Android %s' % arch_pretty,
-                           'arch': arch,
+                           'arch': 'x86' if type == 'x86' else 'armv7 %s' % type,
                            'arch_pretty': arch_pretty,
                            'download_link': link})
 

bedrock/mozorg/tests/test_helper_download_buttons.py

@@ -197,14 +197,16 @@ def test_aurora_mobile(self):
                         {'request': get_request}))
 
         list = doc('.download-list li')
-        eq_(list.length, 2)
-        eq_(pq(list[0]).attr('class'), 'os_android armv7')
-        eq_(pq(list[1]).attr('class'), 'os_android x86')
+        eq_(list.length, 3)
+        eq_(pq(list[0]).attr('class'), 'os_android armv7 api-9')
+        eq_(pq(list[1]).attr('class'), 'os_android armv7 api-11')
+        eq_(pq(list[2]).attr('class'), 'os_android x86')
 
         list = doc('.download-other .arch')
-        eq_(list.length, 2)
-        eq_(pq(list[0]).attr('class'), 'arch armv7')
-        eq_(pq(list[1]).attr('class'), 'arch x86')
+        eq_(list.length, 3)
+        eq_(pq(list[0]).attr('class'), 'arch armv7 api-9')
+        eq_(pq(list[1]).attr('class'), 'arch armv7 api-11')
+        eq_(pq(list[2]).attr('class'), 'arch x86')
 
     def test_beta_mobile(self):
         rf = RequestFactory()

media/css/sandstone/buttons.less

@@ -678,17 +678,22 @@
 
 // Android architecture detection
 
+.download-button .download-list .os_android.api-9,
 .download-button .download-list .os_android.x86,
-.download-button .download-other.os_android .armv7,
+.download-button .download-other.os_android .api-11,
+.android.gingerbread .download-button .download-list .os_android.api-11,
+.android.gingerbread .download-button .download-other.os_android .api-9,
 .android.x86 .download-button .download-list .os_android.armv7,
 .android.x86 .download-button .download-other.os_android .x86 {
     display: none !important;
 }
 
+.android.gingerbread .download-button .download-list .os_android.api-9,
 .android.x86 .download-button .download-list .os_android.x86 {
     display: block !important;
 }
 
+.android.gingerbread .download-button .download-other.os_android .api-11,
 .android.x86 .download-button .download-other.os_android .armv7 {
     display: inline !important;
 }

media/js/base/site.js

@@ -133,6 +133,11 @@
         var platform = window.site.platform = window.site.getPlatform();
         if (platform !== 'windows') {
             h.className = h.className.replace('windows', platform);
+
+            // Add class to support downloading Firefox Aurora for Android Gingerbread
+            if (platform === 'android' && navigator.userAgent.match(/Android\ 2\.3/)) {
+                h.className += ' gingerbread';
+            }
         }
 
         // Add class to reflect the microprocessor architecture info