873230 - Put duplicate xml files for preferences in xml/ and xml-v11/

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Chenxia Liu [:liuche]]

This is a quick band-aid until bug 872754 can get fixed. Separating files by name will make things at least slightly cleaner and more obvious what needs to be changed.

Comment 1

[Chenxia Liu [:liuche]]

Attachment: Patch: Move files into xml/ and xml-v11/

This patch splits the xml files into xml/ and xml-v11/ and removes the stupid naming of *_nonfragment!

This does not incorporate the changes in bug 872504, so it will need one more pass once that is landed.

This still leaves 3 xml files, but at least it's slightly clearer that there are duplicates between fragment/non-fragment layouts. And one of the duplicates should go away soon (Bug 872754).

Comment 2

[Chenxia Liu [:liuche]]

Sorry, the decrease from triplicate to duplicate of xml files refers to bug 872329 (not 872754). Basically, this combines the tablet UI with the v11+ phone UI (instead of having two separate Fragment layouts to maintain).

Comment 3

[Wesley Johnston (:wesj)]

Comment on attachment 750671 [details] [diff] [review]
Patch: Move files into xml/ and xml-v11/

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

This seems like a good reorganization to me, and I like having two preferences_main.

Comment 4

[Chenxia Liu [:liuche]]

Attachment: Patch: Move files into xml/ and xml-v11/ v2

Updated to include the titlebar fix in the newly added files, and running a try build for testing.

Comment 5

[:Margaret Leibovic]

Comment on attachment 751253 [details] [diff] [review]
Patch: Move files into xml/ and xml-v11/ v2

I think wesj is a better reviewer for this.

Two nits to make reviewing easier: You should use 8-line context for diffs, and if these files are just being moved, you should use hg rename for that (I believe that makes a better looking diff, which may preserve history as well).

Comment 6

[Wesley Johnston (:wesj)]

Comment on attachment 751253 [details] [diff] [review]
Patch: Move files into xml/ and xml-v11/ v2

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

::: mobile/android/base/resources/xml-v11/preference_headers.xml
@@ +1,2 @@
> +<?xml version="1.0" encoding="utf-8"?>
> +<!-- This Source Code Form is subject to the terms of the Mozilla Public

Margaret mentioned that maybe you'd be better to hg move these. Of course they've only existed for a few weeks, so there's not much hg blame to preserve, but still... ?

::: mobile/android/base/resources/xml/preferences_main.xml.in
@@ +1,2 @@
> +#filter substitution
> +<?xml version="1.0" encoding="utf-8"?>

I'd rather name this preferences.xml.in.

Comment 7

[Chenxia Liu [:liuche]]

Attachment: Patch: Move files into xml/ and xml-v11/ v3

Patch using hg rename, and renamed preferences_main.xml* to preferences.xml*.

Will land once passes tests on try.

Comment 8

[Chenxia Liu [:liuche]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/3f30698398d9

Comment 9

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/3f30698398d9