654838 - Create a unique branding for Fennec beta

Status: VERIFIED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Mark Finkle (:mfinkle) (use needinfo?)]

We want to be able to install the beta along side the final release (and aurora and nightly) so we need a separate Android package id for beta releases.

Comment 1

[Mark Finkle (:mfinkle) (use needinfo?)]

Attachment: wip

I think this should work, but I need to test

Comment 2

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 530151 [details] [diff] [review]
wip

I don't want to have the . in there since this is our java package name, which would make the beta a sub package of our release package name. I suggest org.mozilla.firefoxBeta

Comment 3

[Mark Finkle (:mfinkle) (use needinfo?)]

We are making a full branding for Firefox Mobile beta

Comment 4

[Mark Finkle (:mfinkle) (use needinfo?)]

Attachment: patch

This adds a full branding folder, changes the appid to "org.mozilla.firefox_beta" and changes "Firefox" -> "Firefox Beta" in the branding strings.

We still need the images to be updated

Comment 5

[Bob Moss :bmoss]

As a side note, by making the changes as proposed, the SUTAgent should work without modification. So test automation should be unaffected.

Comment 6

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 530345 [details] [diff] [review]
patch

Review of attachment 530345 [details] [diff] [review]:
-----------------------------------------------------------------

r=blassey

Comment 7

[Mark Finkle (:mfinkle) (use needinfo?)]

pushed base patch:
http://hg.mozilla.org/mozilla-central/rev/541c4f11d3b6

Comment 8

[Bob Moss :bmoss]

I missed the change to the shared_id. This needs to stay the same even though the packagename is changing. Otherwise a new content provider will need to be created. In the meantime automation will be horked.

Comment 9

[Matt Brubeck (:mbrubeck)]

Note that if beta builds have the same sharedUserId as release builds, then they will need to be signed with the release signing certificate.  Otherwise they will not be installable at the same time as the release builds.

(Past beta releases *were* signed with the release certificate.  As long as we do the same for future beta builds, giving them the same sharedUserId should not cause any problems.)

Comment 10

[Matt Brubeck (:mbrubeck)]

Attachment: part 2: make beta sharedUserId same as release

Is this what you need, Bob?

Comment 11

[Mark Finkle (:mfinkle) (use needinfo?)]

Check to make sure you don't need to update the js/configure.in too. Those are supposed to be in sync.

Comment 12

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 530783 [details] [diff] [review]
part 2: make beta sharedUserId same as release

nothing particularly wrong about this except that we'd have to make a similar change for auora. I've got a patch in bug 655427 that handles both

Comment 13

[Matt Brubeck (:mbrubeck)]

This variable (like ANDROID_PACKAGE_NAME) is not used in js, so does not need to appear in js/configure.

Comment 14

[Brad Lassey [:blassey] (use needinfo?)]

(In reply to comment #11)
> Check to make sure you don't need to update the js/src/configure.in too. Those
> are supposed to be in sync.
there's no requirement for configure.in and js/configure.in to be in sync (and they're not). Its config/* and js/src/config/* that need to be in sync

Comment 15

[Bob Moss :bmoss]

Basically the Content Providers for the mobile automation can handle two sharedID's org.mozilla.fennec.sharedID and org.mozilla.firefox.sharedID, and the agent determines which content provider it uses based upon a "contains" comparison of the fully qualified path (ex: /data/data/[packagename]/... looking for "org.mozilla.firefox" so the proposed "org.mozilla.firefox_beta" works just fine) the same would be true for fennec variants. Let me know if I can clarify here. No insult intended but I like blassey's patch in 655427 it seems pretty straightforward.

Comment 16

[Brad Lassey [:blassey] (use needinfo?)]

This may be a topic for another bug, but why don't we build the agent (and/or content provider) when we build fennec so it can be signed with the same cert as fennec every time?

Comment 17

[Mark Finkle (:mfinkle) (use needinfo?)]

Attachment: part 3

While testing the beta branding, we found the MOZ_APP_DISPLAYNAME needed to be quoted in configure.sh and then again when apssed to the preprocessor to make AndroidManifest.xml

With this patch we are fully function on the device and can run side by side with release, aurora and nightly

Comment 18

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 531531 [details] [diff] [review]
part 3

Review of attachment 531531 [details] [diff] [review]:
-----------------------------------------------------------------

Comment 19

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 530345 [details] [diff] [review]
patch

needed for the upcoming beta builds

Comment 20

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 531531 [details] [diff] [review]
part 3

needed for the upcoming beta builds

Comment 21

[Mark Finkle (:mfinkle) (use needinfo?)]

pushed part 3:
http://hg.mozilla.org/mozilla-central/rev/51a9e2313a22

Comment 22

[Mark Finkle (:mfinkle) (use needinfo?)]

pushed to aurora:
http://hg.mozilla.org/releases/mozilla-aurora/rev/760065072fcb
http://hg.mozilla.org/releases/mozilla-aurora/rev/9c9b353320b5

Waiting to close until the mozconfigs have been updated for beta

Comment 23

[Mark Finkle (:mfinkle) (use needinfo?)]

Attachment: patch 4 - new logos with 'beta' banner

This patch adds the new launcher logos/icons from bug 652652

Example of how it looks here:
http://people.mozilla.com/~mfinkle/fennec/screenshots/fennec-beta-recent.png

Comment 24

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 531941 [details] [diff] [review]
patch 4 - new logos with 'beta' banner

needed for beta ASAP

Comment 25

[JP Rosevear [:jpr]]

Please land for Aurora by Monday May 16 or the approval will potentially be lost.  Please mark as status-firefox5 fixed when you do.

Comment 26

[Matt Brubeck (:mbrubeck)]

Landed in mozilla-central (Firefox 6) and Aurora (Firefox 5):
http://hg.mozilla.org/mozilla-central/rev/9a7b966ab0b6
http://hg.mozilla.org/mozilla-aurora/rev/ad45139f4d29

Comment 27

[Mark Finkle (:mfinkle) (use needinfo?)]

Attachment: patch 5 - maemo

This patch fixes Maemo. The main problem was the handling of MOZ_APP_DISPLAYNAME. The package manifest, and other places, broke due to the space. The installer makefile now quotes MOZ_APP_DISPLAYNAME to avoid the breakage.

The maemo image assests did not have the beta banner we added to the android assets. I replaced the images with the beta banner-ized images.

I built, packaged the deb, and installed on my N900 successfully with this patch

Comment 28

[Mark Finkle (:mfinkle) (use needinfo?)]

pushed part 5:
http://hg.mozilla.org/mozilla-central/rev/ad1fa68dcaf5
http://hg.mozilla.org/releases/mozilla-aurora/rev/b415c95bdb71

Comment 29

[Naoki Hirata :nhirata (please use needinfo instead of cc)]

Need to wait for a beta build in order to verify.

Comment 30

[Mark Finkle (:mfinkle) (use needinfo?)]

You can try verifying using the test beta build:
http://ftp.mozilla.org/pub/mozilla.org/mobile/candidates/5.0b1-candidates/build2/

It was built from mozilla-aurora, so it is versioned as 5.0a2, but it should have the beta branding.

Comment 31

[Andreea Pod]

Verified fixed on: Mozilla /5.0 (Android;Linux armv7l;rv:5.0) Gecko/20110517 Firefox/5.0 Fennec/5.0
Device: LG Optimus 2x