From e6fae06c1e3fa5ef2a0c2ab20a5cc676b711d06f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 05:45:50 -0700 Subject: [PATCH 01/15] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1bd495997fc6 Author: Zac Desc: Revert "Bug 995187 - [1.4]Call log is not showing the full phone number" This reverts commit 38268f9326707012687137167ccad51d5b2e3201. ======== https://hg.mozilla.org/integration/gaia-central/rev/1d15b2fc2e1f Author: Ryan VanderMeulen Desc: Merge pull request #18663 from vanceyen/master Bug 981582 Resend option should only apply for outgoing error message r=julien ======== https://hg.mozilla.org/integration/gaia-central/rev/e6ff0d5b3820 Author: vanceyen Desc: Bug 981582 Resend option should only apply for outgoing error message r=julien --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 7d08c32d0616..73b669265f56 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "5ac501412892042d727a9a09c7089210c8f72edb", + "revision": "1bd495997fc6829db251465a0e6d854d189e02f4", "repo_path": "/integration/gaia-central" } From 3ad798470985c04228056297907330ed0fbf4fa7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 05:51:20 -0700 Subject: [PATCH 02/15] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 132a7d0ce470..566f5a4c537a 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 7715dca72bcf..0af0ab90dd91 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index f7c8f8950920..a585fc1cb9f0 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 132a7d0ce470..566f5a4c537a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 77391c7f4f83..9cbb3d21f5db 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e1907a8af883..0f66b41cdc9c 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index efe1fdd9906e..7790ac523979 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 930dd6e784df..8b7276197108 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index f412f6da0b6e..99c0de686a51 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 6819d5ecdd64..77ea23f45d5d 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index bb4ab86ea3e0..27fce9783dfa 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 69e4ffc6eb725c31983a3d22be25befd5cb9cbf9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 06:25:49 -0700 Subject: [PATCH 03/15] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1cd16812e365 Author: Zac Desc: Merge pull request #18735 from viorelaioia/bug_968744 Bug 968744 - Update test_receive_active_sync_email to check for incoming... ======== https://hg.mozilla.org/integration/gaia-central/rev/3b9c7feea9eb Author: Viorela Ioia Desc: Bug 968744 - Update test_receive_active_sync_email to check for incoming notification ======== https://hg.mozilla.org/integration/gaia-central/rev/753561709b03 Author: Jose M. Cantera Desc: Merge pull request #18239 from jmcanterafonseca/arnau_fix_edit_mode Bug 990478 - Replace confirm [BB] with edit mode [BB] in [Contacts] ======== https://hg.mozilla.org/integration/gaia-central/rev/02381ce472a7 Author: Jose M. Cantera Desc: Bug 990478 - Replace confirm [BB] with edit mode [BB] in [Contacts] --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 73b669265f56..58c60201e58c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "1bd495997fc6829db251465a0e6d854d189e02f4", + "revision": "1cd16812e3656293313ab7791697bf91908393ad", "repo_path": "/integration/gaia-central" } From ba0ce59b78e0fb1f4e7ec97ea199de965fefb34d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 06:27:55 -0700 Subject: [PATCH 04/15] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 566f5a4c537a..280308ffdc0f 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 0af0ab90dd91..9895aba7e561 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index a585fc1cb9f0..559b9c59b6d8 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 566f5a4c537a..280308ffdc0f 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 9cbb3d21f5db..2d4797a34241 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 0f66b41cdc9c..f7e8bafa0190 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 7790ac523979..48d5f1eb4adf 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 8b7276197108..d6b4b04e3358 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 99c0de686a51..0768b8d84d59 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 77ea23f45d5d..1c4fbcca8c41 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 27fce9783dfa..a5c0831df0fd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 360684c593111b52d5002feaa770f245fa5342f4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 08:55:42 -0700 Subject: [PATCH 05/15] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d327e9514a8b Author: Zac Desc: Merge pull request #18420 from zacc/bug_997679 Bug 997679 - Remove marionette calls where session may not exist (in the... ======== https://hg.mozilla.org/integration/gaia-central/rev/97b30d930d7a Author: Zac Desc: Bug 997679 - Remove marionette calls where session may not exist (in the event of a crash) --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 58c60201e58c..5415f95b7ba9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "1cd16812e3656293313ab7791697bf91908393ad", + "revision": "d327e9514a8b8e44ef9fd89c5d8d6d21b3853485", "repo_path": "/integration/gaia-central" } From 02132c4d89251676c9441ae67e6d4292385261a4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 09:01:42 -0700 Subject: [PATCH 06/15] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 280308ffdc0f..20a2491f056b 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 9895aba7e561..fc9d1a60a268 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 559b9c59b6d8..54fcfe1abb45 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 280308ffdc0f..20a2491f056b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 2d4797a34241..9efb9b4aea85 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f7e8bafa0190..5b7c0f282ffb 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 48d5f1eb4adf..9670e15efe0d 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index d6b4b04e3358..35b37e5aa85b 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 0768b8d84d59..814e351068ca 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 1c4fbcca8c41..435ac8ff0a02 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index a5c0831df0fd..79f7fbfa374d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 31a0abe3d356137bf9aab2baf382822bd399867d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 09:05:45 -0700 Subject: [PATCH 07/15] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b8dd552c61e7 Author: Ben Francis Desc: Merge pull request #18762 from rnowm/1002501 Bug 1002501 - Regression: Incorrect background colour of disabled back/forward buttons r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/920075e6f426 Author: rnowm Desc: Bug 1002501 - Regression: Incorrect background colour of disabled back/forward buttons --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 5415f95b7ba9..ac2a7071a169 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d327e9514a8b8e44ef9fd89c5d8d6d21b3853485", + "revision": "b8dd552c61e7df04273319f9d591616dd23e50c1", "repo_path": "/integration/gaia-central" } From 9919077ad6be5b35764ed90a0b2117f50f35a012 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 09:11:32 -0700 Subject: [PATCH 08/15] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 20a2491f056b..eb6b20a46057 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index fc9d1a60a268..6b0e8797f123 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 54fcfe1abb45..445ba3337fbe 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 20a2491f056b..eb6b20a46057 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 9efb9b4aea85..fa371620b3cd 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 5b7c0f282ffb..dd913ed3616c 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9670e15efe0d..082cd2400dca 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 35b37e5aa85b..9491faf11d48 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 814e351068ca..c4e356fae90a 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 435ac8ff0a02..35c8f242726a 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 79f7fbfa374d..2132e5044db9 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From cfe4bc1c6e49604284c734b7ccf935a1b65c233f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 09:20:47 -0700 Subject: [PATCH 09/15] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3985c617f2bb Author: Zac Desc: Merge pull request #18687 from bebef1987/settings Bug 1000062 - Delete some more redundant tests ======== https://hg.mozilla.org/integration/gaia-central/rev/54b613a912e8 Author: Bebe Desc: Bug 1000062 - Delete some more redundant tests ======== https://hg.mozilla.org/integration/gaia-central/rev/1f95c8348db3 Author: Kevin Grandon Desc: Merge pull request #18713 from KevinGrandon/bug_1001888_jshint_shared_test_unit Bug 1001888 - JSHint fixes for shared/js/test/unit ======== https://hg.mozilla.org/integration/gaia-central/rev/4fa9e7e125b1 Author: Kevin Grandon Desc: Bug 1001888 - JSHint fixes for shared/js/test/unit r=etienne --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ac2a7071a169..385e6c1874b2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b8dd552c61e7df04273319f9d591616dd23e50c1", + "revision": "3985c617f2bb303e6789e712b2b50cb4f290ca2e", "repo_path": "/integration/gaia-central" } From b4858048d71fae5fe38ef153aa683738129a97e9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 09:22:57 -0700 Subject: [PATCH 10/15] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index eb6b20a46057..68dbd4eb7162 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 6b0e8797f123..d34d60e067bc 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 445ba3337fbe..0d9cd3577df9 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index eb6b20a46057..68dbd4eb7162 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index fa371620b3cd..06fe5c8afc20 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index dd913ed3616c..bdbe14ed68a1 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 082cd2400dca..3b19d7f7490b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 9491faf11d48..e7b0a6aca1ad 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index c4e356fae90a..ca41e18b8cea 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 35c8f242726a..7161f386f4d9 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 2132e5044db9..3edde63987f0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3c420affc5998f3bb5dba4f2571c40699cd8021f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 09:50:45 -0700 Subject: [PATCH 11/15] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/01fd3ec6f86b Author: Wilson Page Desc: Merge pull request #18692 from wilsonpage/1001530 Bug 1001530 - [Camera][Perf] Don't block startup waiting for activities ======== https://hg.mozilla.org/integration/gaia-central/rev/7285fcc0f157 Author: Wilson Page Desc: Bug 1001530 - [Camera][Perf] Don't block startup waiting for activities --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 385e6c1874b2..4a41b96b9e1c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3985c617f2bb303e6789e712b2b50cb4f290ca2e", + "revision": "01fd3ec6f86bf065b9d9db58c75659a0a7b6d15a", "repo_path": "/integration/gaia-central" } From 17bb43714f716672da9042b917222caba793383d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 09:56:16 -0700 Subject: [PATCH 12/15] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 68dbd4eb7162..7c745a8b07b7 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d34d60e067bc..f54f7ef34a6b 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 0d9cd3577df9..f6ae861c9579 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 68dbd4eb7162..7c745a8b07b7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 06fe5c8afc20..705b8e684887 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index bdbe14ed68a1..ba9f3ea46d8f 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 3b19d7f7490b..430d74299fb3 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index e7b0a6aca1ad..a69b748b884d 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index ca41e18b8cea..aa0145100ce2 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 7161f386f4d9..c3312f64970f 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 3edde63987f0..88e2ebbcf7ec 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 6e6a96d6aae1addf2fe462c37c5f51c57d065da6 Mon Sep 17 00:00:00 2001 From: Jan Keromnes Date: Tue, 29 Apr 2014 02:05:00 -0400 Subject: [PATCH 13/15] Bug 993137 - Introduce cross-platform font pref defaults. r=ochameau, r=jfkthame --- modules/libpref/src/init/all.js | 650 ++++++++------------------------ 1 file changed, 160 insertions(+), 490 deletions(-) diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index c8a194de1e1a..d78ceebc6dd8 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -2063,37 +2063,162 @@ pref("svg.marker-improvements.enabled", false); pref("svg.marker-improvements.enabled", true); #endif + +// Default font types and sizes by locale +pref("font.default.ar", "sans-serif"); pref("font.minimum-size.ar", 0); -pref("font.minimum-size.x-armn", 0); -pref("font.minimum-size.x-beng", 0); -pref("font.minimum-size.x-baltic", 0); -pref("font.minimum-size.x-central-euro", 0); -pref("font.minimum-size.zh-CN", 0); -pref("font.minimum-size.zh-HK", 0); -pref("font.minimum-size.zh-TW", 0); -pref("font.minimum-size.x-cyrillic", 0); -pref("font.minimum-size.x-devanagari", 0); -pref("font.minimum-size.x-ethi", 0); -pref("font.minimum-size.x-geor", 0); +pref("font.size.variable.ar", 16); +pref("font.size.fixed.ar", 13); + +pref("font.default.el", "serif"); pref("font.minimum-size.el", 0); -pref("font.minimum-size.x-gujr", 0); -pref("font.minimum-size.x-guru", 0); +pref("font.size.variable.el", 16); +pref("font.size.fixed.el", 13); + +pref("font.default.he", "sans-serif"); pref("font.minimum-size.he", 0); +pref("font.size.variable.he", 16); +pref("font.size.fixed.he", 13); + +pref("font.default.ja", "sans-serif"); pref("font.minimum-size.ja", 0); -pref("font.minimum-size.x-knda", 0); -pref("font.minimum-size.x-khmr", 0); +pref("font.size.variable.ja", 16); +pref("font.size.fixed.ja", 16); + +pref("font.default.ko", "sans-serif"); pref("font.minimum-size.ko", 0); -pref("font.minimum-size.x-mlym", 0); -pref("font.minimum-size.x-orya", 0); -pref("font.minimum-size.x-sinh", 0); -pref("font.minimum-size.x-tamil", 0); -pref("font.minimum-size.x-telu", 0); -pref("font.minimum-size.x-tibt", 0); +pref("font.size.variable.ko", 16); +pref("font.size.fixed.ko", 16); + +pref("font.default.th", "serif"); pref("font.minimum-size.th", 0); +pref("font.size.variable.th", 16); +pref("font.size.fixed.th", 13); + +pref("font.default.tr", "serif"); pref("font.minimum-size.tr", 0); +pref("font.size.variable.tr", 16); +pref("font.size.fixed.tr", 13); + +pref("font.default.x-baltic", "serif"); +pref("font.minimum-size.x-baltic", 0); +pref("font.size.variable.x-baltic", 16); +pref("font.size.fixed.x-baltic", 13); + +pref("font.default.x-central-euro", "serif"); +pref("font.minimum-size.x-central-euro", 0); +pref("font.size.variable.x-central-euro", 16); +pref("font.size.fixed.x-central-euro", 13); + +pref("font.default.x-cyrillic", "serif"); +pref("font.minimum-size.x-cyrillic", 0); +pref("font.size.variable.x-cyrillic", 16); +pref("font.size.fixed.x-cyrillic", 13); + +pref("font.default.x-devanagari", "serif"); +pref("font.minimum-size.x-devanagari", 0); +pref("font.size.variable.x-devanagari", 16); +pref("font.size.fixed.x-devanagari", 13); + +pref("font.default.x-tamil", "serif"); +pref("font.minimum-size.x-tamil", 0); +pref("font.size.variable.x-tamil", 16); +pref("font.size.fixed.x-tamil", 13); + +pref("font.default.x-armn", "serif"); +pref("font.minimum-size.x-armn", 0); +pref("font.size.variable.x-armn", 16); +pref("font.size.fixed.x-armn", 13); + +pref("font.default.x-beng", "serif"); +pref("font.minimum-size.x-beng", 0); +pref("font.size.variable.x-beng", 16); +pref("font.size.fixed.x-beng", 13); + +pref("font.default.x-cans", "serif"); pref("font.minimum-size.x-cans", 0); -pref("font.minimum-size.x-western", 0); +pref("font.size.variable.x-cans", 16); +pref("font.size.fixed.x-cans", 13); + +pref("font.default.x-ethi", "serif"); +pref("font.minimum-size.x-ethi", 0); +pref("font.size.variable.x-ethi", 16); +pref("font.size.fixed.x-ethi", 13); + +pref("font.default.x-geor", "serif"); +pref("font.minimum-size.x-geor", 0); +pref("font.size.variable.x-geor", 16); +pref("font.size.fixed.x-geor", 13); + +pref("font.default.x-gujr", "serif"); +pref("font.minimum-size.x-gujr", 0); +pref("font.size.variable.x-gujr", 16); +pref("font.size.fixed.x-gujr", 13); + +pref("font.default.x-guru", "serif"); +pref("font.minimum-size.x-guru", 0); +pref("font.size.variable.x-guru", 16); +pref("font.size.fixed.x-guru", 13); + +pref("font.default.x-khmr", "serif"); +pref("font.minimum-size.x-khmr", 0); +pref("font.size.variable.x-khmr", 16); +pref("font.size.fixed.x-khmr", 13); + +pref("font.default.x-mlym", "serif"); +pref("font.minimum-size.x-mlym", 0); +pref("font.size.variable.x-mlym", 16); +pref("font.size.fixed.x-mlym", 13); + +pref("font.default.x-orya", "serif"); +pref("font.minimum-size.x-orya", 0); +pref("font.size.variable.x-orya", 16); +pref("font.size.fixed.x-orya", 13); + +pref("font.default.x-telu", "serif"); +pref("font.minimum-size.x-telu", 0); +pref("font.size.variable.x-telu", 16); +pref("font.size.fixed.x-telu", 13); + +pref("font.default.x-knda", "serif"); +pref("font.minimum-size.x-knda", 0); +pref("font.size.variable.x-knda", 16); +pref("font.size.fixed.x-knda", 13); + +pref("font.default.x-sinh", "serif"); +pref("font.minimum-size.x-sinh", 0); +pref("font.size.variable.x-sinh", 16); +pref("font.size.fixed.x-sinh", 13); + +pref("font.default.x-tibt", "serif"); +pref("font.minimum-size.x-tibt", 0); +pref("font.size.variable.x-tibt", 16); +pref("font.size.fixed.x-tibt", 13); + +pref("font.default.x-unicode", "serif"); pref("font.minimum-size.x-unicode", 0); +pref("font.size.variable.x-unicode", 16); +pref("font.size.fixed.x-unicode", 13); + +pref("font.default.x-western", "serif"); +pref("font.minimum-size.x-western", 0); +pref("font.size.variable.x-western", 16); +pref("font.size.fixed.x-western", 13); + +pref("font.default.zh-CN", "sans-serif"); +pref("font.minimum-size.zh-CN", 0); +pref("font.size.variable.zh-CN", 16); +pref("font.size.fixed.zh-CN", 16); + +pref("font.default.zh-HK", "sans-serif"); +pref("font.minimum-size.zh-HK", 0); +pref("font.size.variable.zh-HK", 16); +pref("font.size.fixed.zh-HK", 16); + +pref("font.default.zh-TW", "sans-serif"); +pref("font.minimum-size.zh-TW", 0); +pref("font.size.variable.zh-TW", 16); +pref("font.size.fixed.zh-TW", 16); /* * A value greater than zero enables font size inflation for @@ -2428,131 +2553,9 @@ pref("font.name-list.serif.x-tibt", "Tibetan Machine Uni, Jomolhari, Microsoft H pref("font.name-list.sans-serif.x-tibt", "Tibetan Machine Uni, Jomolhari, Microsoft Himalaya"); pref("font.name-list.monospace.x-tibt", "Tibetan Machine Uni, Jomolhari, Microsoft Himalaya"); -pref("font.default.ar", "sans-serif"); -pref("font.size.variable.ar", 16); -pref("font.size.fixed.ar", 13); - -pref("font.default.el", "serif"); -pref("font.size.variable.el", 16); -pref("font.size.fixed.el", 13); - -pref("font.default.he", "sans-serif"); -pref("font.size.variable.he", 16); -pref("font.size.fixed.he", 13); - -pref("font.default.ja", "sans-serif"); -pref("font.size.variable.ja", 16); -pref("font.size.fixed.ja", 16); - -pref("font.default.ko", "sans-serif"); -pref("font.size.variable.ko", 16); -pref("font.size.fixed.ko", 16); - -pref("font.default.th", "serif"); -pref("font.size.variable.th", 16); -pref("font.size.fixed.th", 13); pref("font.minimum-size.th", 10); -pref("font.default.tr", "serif"); -pref("font.size.variable.tr", 16); -pref("font.size.fixed.tr", 13); - -pref("font.default.x-baltic", "serif"); -pref("font.size.variable.x-baltic", 16); -pref("font.size.fixed.x-baltic", 13); - -pref("font.default.x-central-euro", "serif"); -pref("font.size.variable.x-central-euro", 16); -pref("font.size.fixed.x-central-euro", 13); - -pref("font.default.x-cyrillic", "serif"); -pref("font.size.variable.x-cyrillic", 16); -pref("font.size.fixed.x-cyrillic", 13); - pref("font.default.x-devanagari", "sans-serif"); -pref("font.size.variable.x-devanagari", 16); -pref("font.size.fixed.x-devanagari", 13); - -pref("font.default.x-tamil", "serif"); -pref("font.size.variable.x-tamil", 16); -pref("font.size.fixed.x-tamil", 13); - -pref("font.default.x-armn", "serif"); -pref("font.size.variable.x-armn", 16); -pref("font.size.fixed.x-armn", 13); - -pref("font.default.x-beng", "serif"); -pref("font.size.variable.x-beng", 16); -pref("font.size.fixed.x-beng", 13); - -pref("font.default.x-cans", "serif"); -pref("font.size.variable.x-cans", 16); -pref("font.size.fixed.x-cans", 13); - -pref("font.default.x-ethi", "serif"); -pref("font.size.variable.x-ethi", 16); -pref("font.size.fixed.x-ethi", 13); - -pref("font.default.x-geor", "serif"); -pref("font.size.variable.x-geor", 16); -pref("font.size.fixed.x-geor", 13); - -pref("font.default.x-gujr", "serif"); -pref("font.size.variable.x-gujr", 16); -pref("font.size.fixed.x-gujr", 13); - -pref("font.default.x-guru", "serif"); -pref("font.size.variable.x-guru", 16); -pref("font.size.fixed.x-guru", 13); - -pref("font.default.x-khmr", "serif"); -pref("font.size.variable.x-khmr", 16); -pref("font.size.fixed.x-khmr", 13); - -pref("font.default.x-mlym", "serif"); -pref("font.size.variable.x-mlym", 16); -pref("font.size.fixed.x-mlym", 13); - -pref("font.default.x-orya", "serif"); -pref("font.size.variable.x-orya", 16); -pref("font.size.fixed.x-orya", 13); - -pref("font.default.x-telu", "serif"); -pref("font.size.variable.x-telu", 16); -pref("font.size.fixed.x-telu", 13); - -pref("font.default.x-knda", "serif"); -pref("font.size.variable.x-knda", 16); -pref("font.size.fixed.x-knda", 13); - -pref("font.default.x-sinh", "serif"); -pref("font.size.variable.x-sinh", 16); -pref("font.size.fixed.x-sinh", 13); - -pref("font.default.x-tibt", "serif"); -pref("font.size.variable.x-tibt", 16); -pref("font.size.fixed.x-tibt", 13); - -pref("font.default.x-unicode", "serif"); -pref("font.size.variable.x-unicode", 16); -pref("font.size.fixed.x-unicode", 13); - -pref("font.default.x-western", "serif"); -pref("font.size.variable.x-western", 16); -pref("font.size.fixed.x-western", 13); - -pref("font.default.zh-CN", "sans-serif"); -pref("font.size.variable.zh-CN", 16); -pref("font.size.fixed.zh-CN", 16); - -pref("font.default.zh-TW", "sans-serif"); -pref("font.size.variable.zh-TW", 16); -pref("font.size.fixed.zh-TW", 16); - -pref("font.default.zh-HK", "sans-serif"); -pref("font.size.variable.zh-HK", 16); -pref("font.size.fixed.zh-HK", 16); - // We have special support for Monotype Symbol on Windows. pref("font.mathfont-family", "MathJax_Main, STIXNonUnicode, STIXSizeOneSym, STIXGeneral, Asana Math, Symbol, DejaVu Sans, Cambria Math"); @@ -2960,130 +2963,11 @@ pref("font.name-list.serif.zh-HK", "Times,LiSong Pro,Heiti TC"); pref("font.name-list.sans-serif.zh-HK", "Helvetica,Heiti TC,LiHei Pro"); pref("font.name-list.monospace.zh-HK", "Courier,Heiti TC,LiHei Pro"); -pref("font.default.ar", "sans-serif"); -pref("font.size.variable.ar", 16); -pref("font.size.fixed.ar", 13); - -pref("font.default.el", "serif"); -pref("font.size.variable.el", 16); -pref("font.size.fixed.el", 13); - -pref("font.default.he", "sans-serif"); -pref("font.size.variable.he", 16); -pref("font.size.fixed.he", 13); - -pref("font.default.ja", "sans-serif"); -pref("font.size.variable.ja", 16); -pref("font.size.fixed.ja", 16); - -pref("font.default.ko", "sans-serif"); -pref("font.size.variable.ko", 16); -pref("font.size.fixed.ko", 16); - -pref("font.default.th", "serif"); -pref("font.size.variable.th", 16); -pref("font.size.fixed.th", 13); +// XP_MACOSX changes to default font sizes pref("font.minimum-size.th", 10); - -pref("font.default.tr", "serif"); -pref("font.size.variable.tr", 16); -pref("font.size.fixed.tr", 13); - -pref("font.default.x-armn", "serif"); -pref("font.size.variable.x-armn", 16); -pref("font.size.fixed.x-armn", 13); - -pref("font.default.x-baltic", "serif"); -pref("font.size.variable.x-baltic", 16); -pref("font.size.fixed.x-baltic", 13); - -pref("font.default.x-beng", "serif"); -pref("font.size.variable.x-beng", 16); -pref("font.size.fixed.x-beng", 13); - -pref("font.default.x-cans", "serif"); -pref("font.size.variable.x-cans", 16); -pref("font.size.fixed.x-cans", 13); - -pref("font.default.x-central-euro", "serif"); -pref("font.size.variable.x-central-euro", 16); -pref("font.size.fixed.x-central-euro", 13); - -pref("font.default.x-cyrillic", "serif"); -pref("font.size.variable.x-cyrillic", 16); -pref("font.size.fixed.x-cyrillic", 13); - -pref("font.default.x-devanagari", "serif"); -pref("font.size.variable.x-devanagari", 16); -pref("font.size.fixed.x-devanagari", 13); - -pref("font.default.x-ethi", "serif"); -pref("font.size.variable.x-ethi", 16); -pref("font.size.fixed.x-ethi", 13); - -pref("font.default.x-geor", "serif"); -pref("font.size.variable.x-geor", 16); -pref("font.size.fixed.x-geor", 13); - -pref("font.default.x-gujr", "serif"); -pref("font.size.variable.x-gujr", 16); -pref("font.size.fixed.x-gujr", 13); - -pref("font.default.x-guru", "serif"); -pref("font.size.variable.x-guru", 16); -pref("font.size.fixed.x-guru", 13); - -pref("font.default.x-khmr", "serif"); -pref("font.size.variable.x-khmr", 16); -pref("font.size.fixed.x-khmr", 13); - -pref("font.default.x-mlym", "serif"); -pref("font.size.variable.x-mlym", 16); -pref("font.size.fixed.x-mlym", 13); - -pref("font.default.x-tamil", "serif"); -pref("font.size.variable.x-tamil", 16); -pref("font.size.fixed.x-tamil", 13); - -pref("font.default.x-orya", "serif"); -pref("font.size.variable.x-orya", 16); -pref("font.size.fixed.x-orya", 13); - -pref("font.default.x-telu", "serif"); -pref("font.size.variable.x-telu", 16); -pref("font.size.fixed.x-telu", 13); - -pref("font.default.x-knda", "serif"); -pref("font.size.variable.x-knda", 16); -pref("font.size.fixed.x-knda", 13); - -pref("font.default.x-sinh", "serif"); -pref("font.size.variable.x-sinh", 16); -pref("font.size.fixed.x-sinh", 13); - -pref("font.default.x-tibt", "serif"); -pref("font.size.variable.x-tibt", 16); -pref("font.size.fixed.x-tibt", 13); - -pref("font.default.x-unicode", "serif"); -pref("font.size.variable.x-unicode", 16); -pref("font.size.fixed.x-unicode", 13); - -pref("font.default.x-western", "serif"); -pref("font.size.variable.x-western", 16); -pref("font.size.fixed.x-western", 13); - -pref("font.default.zh-CN", "sans-serif"); pref("font.size.variable.zh-CN", 15); -pref("font.size.fixed.zh-CN", 16); - -pref("font.default.zh-TW", "sans-serif"); -pref("font.size.variable.zh-TW", 15); -pref("font.size.fixed.zh-TW", 16); - -pref("font.default.zh-HK", "sans-serif"); pref("font.size.variable.zh-HK", 15); -pref("font.size.fixed.zh-HK", 16); +pref("font.size.variable.zh-TW", 15); // Apple's Symbol is Unicode so use it pref("font.mathfont-family", "Latin Modern Math, XITS Math, STIX Math, Cambria Math, Asana Math, TeX Gyre Bonum Math, TeX Gyre Pagella Math, TeX Gyre Termes Math, Neo Euler, Lucida Bright Math, MathJax_Main, STIXNonUnicode, STIXSizeOneSym, STIXGeneral, Symbol, DejaVu Sans"); @@ -3210,7 +3094,7 @@ pref("font.alias-list", "sans,sans-serif,serif,monospace"); // ar -pref("font.name.serif.el", "Droid Serif"); +pref("font.name.serif.el", "Droid Serif"); // not Charis SIL Compact, only has a few Greek chars pref("font.name.sans-serif.el", "Roboto"); // To be updated once the Greek letters in Fira are revised pref("font.name.monospace.el", "Droid Sans Mono"); @@ -3367,131 +3251,33 @@ pref("font.name-list.monospace.zh-TW", "Droid Sans Fallback"); #endif -pref("font.default.ar", "sans-serif"); -pref("font.size.variable.ar", 16); pref("font.size.fixed.ar", 12); pref("font.default.el", "sans-serif"); -pref("font.size.variable.el", 16); pref("font.size.fixed.el", 12); -pref("font.default.he", "sans-serif"); -pref("font.size.variable.he", 16); pref("font.size.fixed.he", 12); -pref("font.default.ja", "sans-serif"); -pref("font.size.variable.ja", 16); -pref("font.size.fixed.ja", 16); - -pref("font.default.ko", "sans-serif"); -pref("font.size.variable.ko", 16); -pref("font.size.fixed.ko", 16); - -pref("font.default.th", "serif"); -pref("font.size.variable.th", 16); -pref("font.size.fixed.th", 13); pref("font.minimum-size.th", 13); pref("font.default.tr", "sans-serif"); -pref("font.size.variable.tr", 16); pref("font.size.fixed.tr", 12); pref("font.default.x-baltic", "sans-serif"); -pref("font.size.variable.x-baltic", 16); pref("font.size.fixed.x-baltic", 12); pref("font.default.x-central-euro", "sans-serif"); -pref("font.size.variable.x-central-euro", 16); pref("font.size.fixed.x-central-euro", 12); pref("font.default.x-cyrillic", "sans-serif"); -pref("font.size.variable.x-cyrillic", 16); pref("font.size.fixed.x-cyrillic", 12); pref("font.default.x-unicode", "sans-serif"); -pref("font.size.variable.x-unicode", 16); pref("font.size.fixed.x-unicode", 12); pref("font.default.x-western", "sans-serif"); -pref("font.size.variable.x-western", 16); pref("font.size.fixed.x-western", 12); -pref("font.default.zh-CN", "sans-serif"); -pref("font.size.variable.zh-CN", 16); -pref("font.size.fixed.zh-CN", 16); - -pref("font.default.zh-TW", "sans-serif"); -pref("font.size.variable.zh-TW", 16); -pref("font.size.fixed.zh-TW", 16); - -pref("font.default.zh-HK", "sans-serif"); -pref("font.size.variable.zh-HK", 16); -pref("font.size.fixed.zh-HK", 16); - -pref("font.default.x-devanagari", "serif"); -pref("font.size.variable.x-devanagari", 16); -pref("font.size.fixed.x-devanagari", 13); - -pref("font.default.x-tamil", "serif"); -pref("font.size.variable.x-tamil", 16); -pref("font.size.fixed.x-tamil", 13); - -pref("font.default.x-armn", "serif"); -pref("font.size.variable.x-armn", 16); -pref("font.size.fixed.x-armn", 13); - -pref("font.default.x-beng", "serif"); -pref("font.size.variable.x-beng", 16); -pref("font.size.fixed.x-beng", 13); - -pref("font.default.x-cans", "serif"); -pref("font.size.variable.x-cans", 16); -pref("font.size.fixed.x-cans", 13); - -pref("font.default.x-ethi", "serif"); -pref("font.size.variable.x-ethi", 16); -pref("font.size.fixed.x-ethi", 13); - -pref("font.default.x-geor", "serif"); -pref("font.size.variable.x-geor", 16); -pref("font.size.fixed.x-geor", 13); - -pref("font.default.x-gujr", "serif"); -pref("font.size.variable.x-gujr", 16); -pref("font.size.fixed.x-gujr", 13); - -pref("font.default.x-guru", "serif"); -pref("font.size.variable.x-guru", 16); -pref("font.size.fixed.x-guru", 13); - -pref("font.default.x-khmr", "serif"); -pref("font.size.variable.x-khmr", 16); -pref("font.size.fixed.x-khmr", 13); - -pref("font.default.x-mlym", "serif"); -pref("font.size.variable.x-mlym", 16); -pref("font.size.fixed.x-mlym", 13); - -pref("font.default.x-orya", "serif"); -pref("font.size.variable.x-orya", 16); -pref("font.size.fixed.x-orya", 13); - -pref("font.default.x-telu", "serif"); -pref("font.size.variable.x-telu", 16); -pref("font.size.fixed.x-telu", 13); - -pref("font.default.x-knda", "serif"); -pref("font.size.variable.x-knda", 16); -pref("font.size.fixed.x-knda", 13); - -pref("font.default.x-sinh", "serif"); -pref("font.size.variable.x-sinh", 16); -pref("font.size.fixed.x-sinh", 13); - -pref("font.default.x-tibt", "serif"); -pref("font.size.variable.x-tibt", 16); -pref("font.size.fixed.x-tibt", 13); - # ANDROID || FXOS_SIMUALTOR #endif @@ -3566,15 +3352,17 @@ pref("print.print_extra_margin", 0); // twips pref("font.alias-list", "sans,sans-serif,serif,monospace"); -// ar +pref("font.size.fixed.ar", 12); pref("font.name.serif.el", "serif"); pref("font.name.sans-serif.el", "sans-serif"); pref("font.name.monospace.el", "monospace"); +pref("font.size.fixed.el", 12); pref("font.name.serif.he", "serif"); pref("font.name.sans-serif.he", "sans-serif"); pref("font.name.monospace.he", "monospace"); +pref("font.size.fixed.he", 12); pref("font.name.serif.ja", "serif"); pref("font.name.sans-serif.ja", "sans-serif"); @@ -3586,31 +3374,38 @@ pref("font.name.monospace.ko", "monospace"); pref("font.name.serif.th", "serif"); pref("font.name.sans-serif.th", "sans-serif"); +pref("font.minimum-size.th", 13); pref("font.name.monospace.th", "monospace"); pref("font.name.serif.tr", "serif"); pref("font.name.sans-serif.tr", "sans-serif"); pref("font.name.monospace.tr", "monospace"); +pref("font.size.fixed.tr", 12); pref("font.name.serif.x-baltic", "serif"); pref("font.name.sans-serif.x-baltic", "sans-serif"); pref("font.name.monospace.x-baltic", "monospace"); +pref("font.size.fixed.x-baltic", 12); pref("font.name.serif.x-central-euro", "serif"); pref("font.name.sans-serif.x-central-euro", "sans-serif"); pref("font.name.monospace.x-central-euro", "monospace"); +pref("font.size.fixed.x-central-euro", 12); pref("font.name.serif.x-cyrillic", "serif"); pref("font.name.sans-serif.x-cyrillic", "sans-serif"); pref("font.name.monospace.x-cyrillic", "monospace"); +pref("font.size.fixed.x-cyrillic", 12); pref("font.name.serif.x-unicode", "serif"); pref("font.name.sans-serif.x-unicode", "sans-serif"); pref("font.name.monospace.x-unicode", "monospace"); +pref("font.size.fixed.x-unicode", 12); pref("font.name.serif.x-western", "serif"); pref("font.name.sans-serif.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); +pref("font.size.fixed.x-western", 12); pref("font.name.serif.zh-CN", "serif"); pref("font.name.sans-serif.zh-CN", "sans-serif"); @@ -3624,131 +3419,6 @@ pref("font.name.monospace.zh-HK", "monospace"); // zh-TW -pref("font.default.ar", "sans-serif"); -pref("font.size.variable.ar", 16); -pref("font.size.fixed.ar", 12); - -pref("font.default.el", "serif"); -pref("font.size.variable.el", 16); -pref("font.size.fixed.el", 12); - -pref("font.default.he", "sans-serif"); -pref("font.size.variable.he", 16); -pref("font.size.fixed.he", 12); - -pref("font.default.ja", "sans-serif"); -pref("font.size.variable.ja", 16); -pref("font.size.fixed.ja", 16); - -pref("font.default.ko", "sans-serif"); -pref("font.size.variable.ko", 16); -pref("font.size.fixed.ko", 16); - -pref("font.default.th", "serif"); -pref("font.size.variable.th", 16); -pref("font.size.fixed.th", 13); -pref("font.minimum-size.th", 13); - -pref("font.default.tr", "serif"); -pref("font.size.variable.tr", 16); -pref("font.size.fixed.tr", 12); - -pref("font.default.x-baltic", "serif"); -pref("font.size.variable.x-baltic", 16); -pref("font.size.fixed.x-baltic", 12); - -pref("font.default.x-central-euro", "serif"); -pref("font.size.variable.x-central-euro", 16); -pref("font.size.fixed.x-central-euro", 12); - -pref("font.default.x-cyrillic", "serif"); -pref("font.size.variable.x-cyrillic", 16); -pref("font.size.fixed.x-cyrillic", 12); - -pref("font.default.x-unicode", "serif"); -pref("font.size.variable.x-unicode", 16); -pref("font.size.fixed.x-unicode", 12); - -pref("font.default.x-western", "serif"); -pref("font.size.variable.x-western", 16); -pref("font.size.fixed.x-western", 12); - -pref("font.default.zh-CN", "sans-serif"); -pref("font.size.variable.zh-CN", 16); -pref("font.size.fixed.zh-CN", 16); - -pref("font.default.zh-TW", "sans-serif"); -pref("font.size.variable.zh-TW", 16); -pref("font.size.fixed.zh-TW", 16); - -pref("font.default.zh-HK", "sans-serif"); -pref("font.size.variable.zh-HK", 16); -pref("font.size.fixed.zh-HK", 16); - -pref("font.default.x-devanagari", "serif"); -pref("font.size.variable.x-devanagari", 16); -pref("font.size.fixed.x-devanagari", 13); - -pref("font.default.x-tamil", "serif"); -pref("font.size.variable.x-tamil", 16); -pref("font.size.fixed.x-tamil", 13); - -pref("font.default.x-armn", "serif"); -pref("font.size.variable.x-armn", 16); -pref("font.size.fixed.x-armn", 13); - -pref("font.default.x-beng", "serif"); -pref("font.size.variable.x-beng", 16); -pref("font.size.fixed.x-beng", 13); - -pref("font.default.x-cans", "serif"); -pref("font.size.variable.x-cans", 16); -pref("font.size.fixed.x-cans", 13); - -pref("font.default.x-ethi", "serif"); -pref("font.size.variable.x-ethi", 16); -pref("font.size.fixed.x-ethi", 13); - -pref("font.default.x-geor", "serif"); -pref("font.size.variable.x-geor", 16); -pref("font.size.fixed.x-geor", 13); - -pref("font.default.x-gujr", "serif"); -pref("font.size.variable.x-gujr", 16); -pref("font.size.fixed.x-gujr", 13); - -pref("font.default.x-guru", "serif"); -pref("font.size.variable.x-guru", 16); -pref("font.size.fixed.x-guru", 13); - -pref("font.default.x-khmr", "serif"); -pref("font.size.variable.x-khmr", 16); -pref("font.size.fixed.x-khmr", 13); - -pref("font.default.x-mlym", "serif"); -pref("font.size.variable.x-mlym", 16); -pref("font.size.fixed.x-mlym", 13); - -pref("font.default.x-orya", "serif"); -pref("font.size.variable.x-orya", 16); -pref("font.size.fixed.x-orya", 13); - -pref("font.default.x-telu", "serif"); -pref("font.size.variable.x-telu", 16); -pref("font.size.fixed.x-telu", 13); - -pref("font.default.x-knda", "serif"); -pref("font.size.variable.x-knda", 16); -pref("font.size.fixed.x-knda", 13); - -pref("font.default.x-sinh", "serif"); -pref("font.size.variable.x-sinh", 16); -pref("font.size.fixed.x-sinh", 13); - -pref("font.default.x-tibt", "serif"); -pref("font.size.variable.x-tibt", 16); -pref("font.size.fixed.x-tibt", 13); - /* PostScript print module prefs */ // pref("print.postscript.enabled", true); pref("print.postscript.paper_size", "letter"); From 9d8606f6c2691c0be8b5044514bd115f9c06ce2f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 10:07:53 -0700 Subject: [PATCH 14/15] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/57f2289efede Author: Ryan VanderMeulen Desc: Merge pull request #18433 from yzen/bug-997900 Bug 997900 - fixed screen reader visibility of the status bar icons when... ======== https://hg.mozilla.org/integration/gaia-central/rev/127ed19ee987 Author: Yura Zenevich Desc: Bug 997900 - fixed screen reader visibility of the status bar icons when the rocket bar is active. r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/17390a4a348c Author: Douglas Sherk Desc: Merge pull request #18756 from DouglasSherk/998972-voicemail-sim-indicator-string Bug 998972 - [System] Use a new string for voicemail SIM notifications. r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/2f1ef5e1b0ed Author: DouglasSherk Desc: Bug 998972 - [System] Use a new string for voicemail SIM notifications. r=etienne --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4a41b96b9e1c..1b0535473026 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "01fd3ec6f86bf065b9d9db58c75659a0a7b6d15a", + "revision": "57f2289efede696f9e5aa537da0223becf2e6422", "repo_path": "/integration/gaia-central" } From 576c3849453d10296f509d673a2d5403ccd98adc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 29 Apr 2014 10:08:04 -0700 Subject: [PATCH 15/15] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7c745a8b07b7..ecbe27aebdcf 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index f54f7ef34a6b..c14829f32ddd 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index f6ae861c9579..2a7df7b959ff 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 7c745a8b07b7..ecbe27aebdcf 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 705b8e684887..15829c813e90 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index ba9f3ea46d8f..a25241fc453e 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 430d74299fb3..82d4dab82be4 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a69b748b884d..36ff06bea9f0 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index aa0145100ce2..28a688c9ac85 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index c3312f64970f..5cf1fa433c50 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 88e2ebbcf7ec..1da7e2a1da10 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +