712574 - Better to use just <include> and avoid <merge>

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect, P4)

Description

[Sriram Ramasubramanian [:sriram]]

On a sudden realization, I found that we are including something into another <custom.View> and creating a new file for this included content inside a <merge>.
Instead, we can have the <custom.View> as the parent element.
I'm not sure if this can provide a performance win, but the code looks more elegant.

Comment 1

[Sriram Ramasubramanian [:sriram]]

Attachment: Patch

This patch remove 2 files in layout-v11/.
One of the files have been renamed for better naming convention.
A new file is added to separate the "awesomebar_search" related UI.
As expected, the code looks better and clearer (than having an "action_bar") file separately.
I haven't checked it against any performance win -- but we should have some for sure. :)

Comment 2

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

Comment on attachment 583421 [details] [diff] [review]
Patch

Looks good to me. Getting Brad for a second opinion.

Comment 3

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

https://hg.mozilla.org/integration/mozilla-inbound/rev/757a48403154

Comment 4

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/757a48403154

Comment 5

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

Comment on attachment 583421 [details] [diff] [review]
Patch

[Approval Request Comment]
Cleans up the code, Uses a better pattern. Blocking other changes from Aurora.

Comment 6

[Alex Keybl [:akeybl]]

Comment on attachment 583421 [details] [diff] [review]
Patch

[Triage Comment]
Mobile only - approved for aurora.

Comment 7

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

https://hg.mozilla.org/releases/mozilla-aurora/rev/ac659ffd7c54