Carsten "Tomcat" Book
a45f50d9ec
Merge mozilla-central to fx-team
2014-11-25 14:24:48 +01:00
Asaf Romano
7b844a88ce
Bug 1098296 - addLivemark should take a dateAdded input property. r=mak
2014-11-25 14:34:20 +02:00
Nicolas Perriault
4fc8bdf986
Bug 1086512 - Added feedback form to Loop desktop room window. r=Standard8
2014-11-25 13:19:34 +01:00
Asaf Romano
728a1cc90d
Bug 1103960 - aNewParentGuid isn't passed to onItemMoved by PlacesUtils.bookmarks.update. r=mak.
2014-11-25 14:16:46 +02:00
Asaf Romano
b4761de76b
Bug 1096856 - fetch({ url }) should exclude tags. r=mak
2014-11-25 14:00:53 +02:00
Asaf Romano
df2ebf6d72
Bug 1096837 - Allow PlacesUtils.bookmarks.update({ parentGuid, index: DEFAULT_INDEX }). r=mak
2014-11-25 13:33:28 +02:00
Asaf Romano
40733d42bd
Bug 1085291 - A bookmark node that is inserted by live-update code is missing bookmarkGuid value. r=mak (Relanding with the test file included this time).
2014-11-25 11:43:26 +02:00
Carsten "Tomcat" Book
3151484b04
Backed out changeset 6db486ed2de1 (bug 1085291) for breaking Builds on a CLOSED TREE
2014-11-25 09:25:11 +01:00
Carsten "Tomcat" Book
c1e3bc535f
Backed out changeset 3c91378ef39b (bug 1102339) for suspicion of breaking non-Android builds on a CLOSED TREE
2014-11-25 08:43:36 +01:00
Carsten "Tomcat" Book
cfaa0adafa
Backed out changeset 5be12b2b704f (bug 1102488)
2014-11-25 08:42:58 +01:00
Carsten "Tomcat" Book
d7549b4913
Backed out changeset e3a52be782f7 (bug 1102488)
2014-11-25 08:42:57 +01:00
Carsten "Tomcat" Book
7403af97fc
Backed out changeset ae7b2705bfa7 (bug 1102488)
2014-11-25 08:42:55 +01:00
Carsten "Tomcat" Book
ea9a36b40f
Backed out changeset 51e6a0c2187b (bug 1102488)
2014-11-25 08:42:54 +01:00
Carsten "Tomcat" Book
e99583e388
Backed out changeset f264f1d096a1 (bug 1102488)
2014-11-25 08:42:50 +01:00
Asaf Romano
f07bafbc06
Bug 1103636 - PlacesTransactions.Remove(guids), PlacesTransactions.RemoveBookmarksForUrls. r=mak.
2014-11-25 09:26:42 +02:00
Asaf Romano
9c9d73d42e
Bug 1103622 - PlacesTransactions.Annotate for multiple items. r=mak.
2014-11-25 09:20:00 +02:00
Asaf Romano
908d732cbf
Bug 1085291 - A bookmark node that is inserted by live-update code is missing bookmarkGuid value. r=mak.
2014-11-25 09:06:37 +02:00
Richard Newman
8f7dccffa3
Bug 1101527 - Don't set locales after Gecko startup. r=nchen,bnicholson
2014-11-24 22:16:26 -08:00
Nick Alexander
9db3e99d51
Bug 1102488 - Part 3: Output preprocessed files into generated/preprocessed. r=rnewman
...
The preprocessed files, all of which are constant exports, are exposed
in the new constants JAR.
--HG--
extra : rebase_source : f82988bd98e2390889057982d322add509b2d1c9
extra : source : 05cf424592e66f30c9a6c92f07bb5d9cdf1595a6
2014-11-20 14:25:52 -08:00
Nick Alexander
6c9336e2a8
Bug 1102488 - Part 2: Don't preprocess GeckoLoader. r=rnewman
...
I replaced the compile-time ANDROID_PACKAGE_NAME with the run-time
context.getPackageName() for two reasons:
1) I claim this is more correct. It's hard to imagine Fennec working
with ANDROID_PACKAGE_NAME != context.getPackageName(), but right here
we should use the run-time, not the build-time state.
2) GeckoLoader is part of GeckoView, and as such it shouldn't assume
anything about the package it's running as.
GeckoView consumers may ship for multiple architectures, so we
shouldn't assume anything about the build-time architecture, but the
reference to MOZ_CPU_ABI is purely diagnostic. There are substantive
changes to make here; we'll cross that bridge some other time.
--HG--
extra : rebase_source : 65b374746f1630fd7c7c201a50bc2ff9dd29090d
extra : source : 48fc328377d41596900fa924b21378ba65a0df1f
2014-11-20 14:39:10 -08:00
Nick Alexander
cdd980f480
Bug 1102488 - Part 1: Factor out constants JAR. r=rnewman
...
The constants JAR contains AppConstants and SysInfo. SysInfo depended
on HardwareUtils for one function, which can (should?) be in SysInfo
anyway, so I moved it.
Both SysInfo and AppConstants should be available to Robocop tests,
but they are compiled too early to access RobocopTarget. Since
nothing in GeckoView should know about GeckoView, I moved the
annotation to the Fennec-level proguard.cfg.
--HG--
extra : rebase_source : cdba5f056a41ec28f190dd7ebf82213a358cb3a8
extra : source : d2c14599cbab6c476465a6ba142c7c2501895cb3
2014-11-24 15:37:30 -08:00
Nick Alexander
03f38e392c
Bug 1102488 - Part 0: Make FxAccountConstants independent of Logger. r=rnewman
...
--HG--
extra : rebase_source : 5f85ea54b5afa611868c856a1027461d6c711b5f
extra : source : 8d1d39582e497c2c47400740304bdc98f0aef0a7
2014-11-20 15:07:35 -08:00
Nick Alexander
52e4b7d489
Bug 1102488 - Pre: Remove unused cruft. r=rnewman
...
I am thrilled that we no longer generate any Java files with "package
@ANDROID_PACKAGE_NAME@;". Progress, a little at a time!
--HG--
extra : rebase_source : f5211b309488adbab3ad47e63f1a3920093a85d8
extra : source : fa85f8d8b182fad743556a012a982daad121f0b1
2014-11-20 14:05:57 -08:00
Nick Alexander
e097540809
Bug 1102339 - Don't generate widget/Themed*.java. r=rnewman
...
This lands the widget/Themed*.java sources into the tree and provides
a simple script for regenerating them in the source tree. Use it
like:
<edit mobile/android/base/widget/ThemedView.java.frag>
$ ./mach python mobile/android/base/widget/generate_themed_views.py
$ hg diff
... changes to Themed*java
--HG--
extra : rebase_source : c32966b91ac0c1c5719532e3b558c123c3d02c7e
extra : source : 4bcc69eb4a27db09b2423c52c22a0c07baffd7d0
2014-11-21 11:04:58 -08:00
Kai-Zhen Li
7f5c395cb8
Bug 1102324 - Update date ipc/keystore/KeyStore.cpp for api level 21. r=chulee
2014-11-21 01:12:06 +08:00
B2G Bumper Bot
95f7cfd624
Bumping manifests a=b2g-bump
2014-11-24 21:21:38 -08:00
B2G Bumper Bot
c59393eae5
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a69353fc9b76
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #26213 from jrburke/bug1092440-email-text-selection
Bug 1092440 - Email should follow text selection pattern r=asuth
========
https://hg.mozilla.org/integration/gaia-central/rev/c0b69da03a3f
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1092440 - Email should follow text selection pattern
========
https://hg.mozilla.org/integration/gaia-central/rev/7e87f718f77b
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #26162 from jrburke/bug1064617-email-rtl
Bug 1064617 - (email-rtl) [META] [RTL] Email r=asuth
========
https://hg.mozilla.org/integration/gaia-central/rev/1bed4370deb1
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1064617 - (email-rtl) [META] [RTL] Email
2014-11-24 21:12:03 -08:00
B2G Bumper Bot
d22a66bca9
Bumping manifests a=b2g-bump
2014-11-24 19:17:01 -08:00
B2G Bumper Bot
67c6c865fe
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0e80021034fe
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #26429 from jrburke/bug1102554-email-update-sig-button
Bug 1102554 - [Email][Signature] Email signature preview does not update in initial setup r=asuth
========
https://hg.mozilla.org/integration/gaia-central/rev/d2fc07f8ca86
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1102554 - [Email][Signature] Email signature preview does not update in initial setup
2014-11-24 19:12:09 -08:00
Jessica Jong
d3d5e36934
Bug 1058305 - Part 4: use defined network types in nsIRadioInterface (tests). r=echen
2014-11-25 09:44:37 +08:00
Jessica Jong
1216f8260f
Bug 1058305 - Part 3: use defined network types in nsIRadioInterface (other components). r=echen
2014-11-25 09:44:35 +08:00
Jessica Jong
ed5335372f
Bug 1058305 - Part 2: use defined network types in nsIRadioInterface (impl). r=echen
2014-11-25 09:44:33 +08:00
Jessica Jong
6bc37e16d1
Bug 1058305 - Part 1: use defined network types in nsIRadioInterface (idl). r=hsinyi
2014-11-25 09:44:31 +08:00
Wes Kocher
a52d89e75d
Merge m-c to b2g-inbound a=merge
2014-11-24 17:11:37 -08:00
Wes Kocher
d8aa973126
Bug 1104301 - Re-disable this test on linux after an accidental reenabling. r=me a=merge
2014-11-24 16:23:51 -08:00
Wes Kocher
1d5fb56d35
Merge inbound to m-c a=merge
2014-11-24 16:55:25 -08:00
Wes Kocher
a98bb652c6
Merge fx-team to m-c a=merge
2014-11-24 16:28:02 -08:00
B2G Bumper Bot
1f3c63e772
Bumping manifests a=b2g-bump
2014-11-24 15:31:57 -08:00
B2G Bumper Bot
c7eaee707c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a378b9d1db68
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #26359 from wilsonpage/1102138
Bug 1102138 - [gaia-header] Should no longer reverse content in RTL mode
========
https://hg.mozilla.org/integration/gaia-central/rev/a628ca8b272e
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1102138 - [gaia-header] Should no longer reverse content in RTL mode
2014-11-24 15:26:54 -08:00
B2G Bumper Bot
19e1decfd9
Bumping manifests a=b2g-bump
2014-11-24 15:01:58 -08:00
B2G Bumper Bot
946117e5c0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c759db1bcc07
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #26367 from azasypkin/bug-1094076-intermittent-test-wait
Bug 1094076 - Intermittent failing test, TEST-UNEXPECTED-FAIL | apps/… …sms/test/marionette/composer_test.js | Messages Composer Messages Composer Test Suite Message char counter and MMS label. r=julien
========
https://hg.mozilla.org/integration/gaia-central/rev/96338d97aa8c
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1094076 - Intermittent failing test, TEST-UNEXPECTED-FAIL | apps/sms/test/marionette/composer_test.js | Messages Composer Messages Composer Test Suite Message char counter and MMS label. r=julien
2014-11-24 14:56:55 -08:00
Ryan VanderMeulen
fb8d05cd59
Backed out changesets 9beb53e53951, 4420bb4e5e7c, de1da65301a8, and cd9c2aaf1343 (bug 970307) for causing frequent B2G debug mochitest-11 crashes.
2014-11-24 17:18:27 -05:00
B2G Bumper Bot
5168639c83
Bumping manifests a=b2g-bump
2014-11-24 11:56:57 -08:00
B2G Bumper Bot
3ca9495f5b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8879d60a0cc3
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #26402 from albertopq/1100157-ambient-pointer
Bug 1100157 - Utility tray is hard to pull with ambient indicator r=etienne_s
========
https://hg.mozilla.org/integration/gaia-central/rev/3703e3467c4f
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1100157 - Utility tray is hard to pull with ambient indicator
2014-11-24 11:51:53 -08:00
B2G Bumper Bot
b99053a88c
Bumping manifests a=b2g-bump
2014-11-24 10:30:33 -08:00
B2G Bumper Bot
c9bcfc3655
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ac3824a2f55d
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #26113 from arcturus/bug-1093002
Bug 1093002 - [Flame][v2.1][Contact]The title name of contact list changes after you lock and unlock the screen. r=jmcf
========
https://hg.mozilla.org/integration/gaia-central/rev/43f6a8a364cd
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1093002 - [Flame][v2.1][Contact]The title name of contact list changes after you lock and unlock the screen. r=jmcf
========
https://hg.mozilla.org/integration/gaia-central/rev/7b458731fa66
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #26248 from etiennesegonzac/bug-1096704
Bug 1096704 - Prevent rocketbar trigger during an edge gesture. r=alive, aus
========
https://hg.mozilla.org/integration/gaia-central/rev/ca637d80bbbd
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1096704 - Prevent rocketbar trigger during an edge gesture.
(cherry picked from commit 4d4f7b91c958f6cee8a13a4fe43c25840c142911)
========
https://hg.mozilla.org/integration/gaia-central/rev/379d4f97e650
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #26255 from azasypkin/bug-1100915-usage-lazy-loader
Bug 1100915 - [Usage][Refactoring] Use LazyLoader to load views. r=salva
========
https://hg.mozilla.org/integration/gaia-central/rev/20ab4fa32430
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1100915 - [Usage][Refactoring] Use LazyLoader to load views. r=salva
2014-11-24 10:30:18 -08:00
Kartikaya Gupta
da1d7035e5
Bug 1056388 - Add assertions as per TODO. r=botond
2014-11-24 13:23:57 -05:00
B2G Bumper Bot
79f8105a40
Bumping manifests a=b2g-bump
2014-11-24 09:56:39 -08:00
B2G Bumper Bot
0bf0833a43
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4f37233ad65c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #26335 from ADLR-es/highlight-accented
Bug 1088706 - Accented characters like ñ are not highlighted after doing...
========
https://hg.mozilla.org/integration/gaia-central/rev/a95c571b0a95
Author: Adrián de la Rosa <hola@adlr.es>
Desc: Bug 1088706 - Accented characters like ñ are not highlighted after doing a search with them
2014-11-24 09:47:01 -08:00
B2G Bumper Bot
ccbf275bfd
Bumping manifests a=b2g-bump
2014-11-24 09:03:36 -08:00