(photon) - Duplicate resource files to different flavor directory

RESOLVED FIXED in Firefox 56

Status

()

RESOLVED FIXED
a year ago
a year ago

People

(Reporter: walkingice, Assigned: walkingice)

Tracking

(Blocks: 1 bug)

unspecified
Firefox 56
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(firefox56 fixed)

Details

Attachments

(4 attachments)

(Assignee)

Description

a year ago
In bug 1372486 we create two more directories for different flavor. Australis specific resources will be put under '../app/src/australis/**', and '../app/src/photon/**' is for Photon. For common/shared resources are under '../app/src/main/**'

This bug is to duplicate resources which will be changed in Photon, therefore every developer who work on Photon, could base this bug to develop.

The way to duplicate is to 1) move xml files from 'main' to 'australis' 2) copy xml files from 'australis' to 'photon'

Those xml files includes

* colors.xml
* values-*/styles.xml
* values-*/dimens.xml
Comment hidden (mozreview-request)
Comment hidden (mozreview-request)
Comment hidden (mozreview-request)
Comment hidden (mozreview-request)

Comment 5

a year ago
mozreview-review
Comment on attachment 8880328 [details]
Bug 1375448 (Part 1) - duplicate colors.xml

https://reviewboard.mozilla.org/r/151682/#review156798

I'm fine with this approach.  Wish we could use Gradle's override system instead, but it's not worth making that work in moz.build.

Try won't exercise this all that well, but I see you've got lint errors that look real.  You'll need to figure out what's supposed to happen before landing.  (You can run Android lint locally with invocations like `mach gradle :app:findbugsOfficialAustralisDebug`.)
Attachment #8880328 - Flags: review?(nalexander) → review+

Comment 6

a year ago
mozreview-review
Comment on attachment 8880329 [details]
Bug 1375448 (Part 2) - duplicate styles.xml

https://reviewboard.mozilla.org/r/151684/#review156802
Attachment #8880329 - Flags: review?(nalexander) → review+

Comment 7

a year ago
mozreview-review
Comment on attachment 8880330 [details]
Bug 1375448 (Part 3) - duplicate dimens.xml

https://reviewboard.mozilla.org/r/151686/#review156804
Attachment #8880330 - Flags: review?(nalexander) → review+

Comment 8

a year ago
mozreview-review
Comment on attachment 8880331 [details]
Bug 1375448 (Part 4) - add Photon color palette to colors.xml

https://reviewboard.mozilla.org/r/151688/#review156806

This is not always obvious, but for non-build things prefer review from one of your direct team rather than me.  First, I don't know what's correct in this space; and second, I'm not in your local timezone, so you might have to wait longer.  I'm hoping that I won't be involved in your review cycle at all pretty soon!  In the meantime, thanks for keeping me in the loop.
Attachment #8880331 - Flags: review?(nalexander) → review+
(Assignee)

Comment 9

a year ago
Understood, and I appreciate your effort on this! Thanks!
Comment hidden (mozreview-request)
Comment hidden (mozreview-request)
Comment hidden (mozreview-request)
(Assignee)

Comment 13

a year ago
For lint error, I replaced NewApi checking from 'main' to 'australia' and 'photon'.

And added 'photon/res/values/colors.xml' to UnusedResources checking, some color code will be used in upcoming implementation. This line will be removed in bug 1375351.
(Assignee)

Updated

a year ago
Keywords: checkin-needed

Comment 14

a year ago
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 421c30e8444c -d 0913080e2c6a: rebasing 403622:421c30e8444c "Bug 1375448 (Part 1) - duplicate colors.xml r=nalexander"
rebasing 403623:5c3257a819ba "Bug 1375448 (Part 2) - duplicate styles.xml r=nalexander"
merging mobile/android/app/lint.xml
warning: conflicts while merging mobile/android/app/lint.xml! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
Comment hidden (mozreview-request)
Comment hidden (mozreview-request)
Comment hidden (mozreview-request)
Comment hidden (mozreview-request)
(Assignee)

Comment 19

a year ago
fetch today's central and rebased my commits onto it.

Comment 20

a year ago
Pushed by ryanvm@gmail.com:
https://hg.mozilla.org/integration/autoland/rev/dee10e94f631
(Part 1) - duplicate colors.xml r=nalexander
https://hg.mozilla.org/integration/autoland/rev/5b30cf9516da
(Part 2) - duplicate styles.xml r=nalexander
https://hg.mozilla.org/integration/autoland/rev/98d25713c5b8
(Part 3) - duplicate dimens.xml r=nalexander
https://hg.mozilla.org/integration/autoland/rev/629f02cdaee7
(Part 4) - add Photon color palette to colors.xml r=nalexander
Keywords: checkin-needed
You need to log in before you can comment on or make changes to this bug.