Commit Graph

170016 Commits

Author SHA1 Message Date
Wes Kocher
6375199d3d Merge m-c to fx-team 2014-02-24 18:29:49 -08:00
Nick Alexander
9f28062bcf Bug 903528 - Post: Add Eclipse project data to moz.build. r=rnewman 2014-02-24 18:24:46 -08:00
Nick Alexander
7552414b04 Bug 903528 - Part 2: Land and build Fennec JUnit 3 tests. r=rnewman
--HG--
rename : mobile/android/tests/moz.build => mobile/android/tests/browser/moz.build
2014-02-24 18:24:46 -08:00
Nick Alexander
04efb6fd76 Bug 903528 - Part 1: Rename background.apk to background-junit3.apk. r=rnewman
This is a cautionary move: when uploaded to infrastructure,
background.apk will not look so bad; but browser.apk is likely to
confuse folks. (These files will be in the same directory as
fennec-*apk, and sort earlier than that file.)

I considered including "tests" in the name, but decided not to make a
long name even longer.

This also renames the Android package. This is purely cosmetic, since
the package has no consumers (infrastructure, mach, etc). But this looks
nicer in IDEs: the generated classes fit into the class hierarchy.
2014-02-24 18:24:45 -08:00
Nick Alexander
0d131e80d7 Bug 903528 - Pre: Make classes.dex depend on ANDROID_EXTRA_JARS. r=glandium 2014-02-24 18:24:45 -08:00
Nick Alexander
0bd48f21ac Bug 975622 - Follow-up: Fix test. r=bustage 2014-02-24 18:23:02 -08:00
Nick Alexander
14995d1458 Bug 976353 - Part 2: Make AndroidEclipse backend install clean up defaults. r=rnewman
This installs:

* Remove unused imports
* Add missing '@Override' annotations
* Add missing '@Override' annotations to implementations of interface methods
* Add missing '@Deprecated' annotations
* Remove unnecessary casts
* Remove unnecessary '$NON-NLS$' tags
* Organize imports
* Remove trailing white spaces on all lines

The installation is "per project", when it could in theory be shared,
because it's quite difficult to actually arrange the sharing.  We'd need
to write into an Eclipse workspace (which we don't currently even know).
2014-02-24 18:14:05 -08:00
Nick Alexander
b07e0498e1 Bug 976353 - Part 1: Make AndroidEclipse backend install formatting defaults. r=rnewman
The most important part here is 4 spaces, no tabs.  We can iterate on
other things over time.

The installation is "per project", when it could in theory be shared,
because it's quite difficult to actually arrange the sharing.  We'd need
to write into an Eclipse workspace (which we don't currently even know).
2014-02-24 18:14:05 -08:00
Nick Alexander
1c51cc09f3 Bug 975152 - Part 2: Make Fennec* projects sort nicely in Eclipse. r=bnicholson
This orders projects like:

Fennec
FennecResources
FennecResourcesBranding
...

which is in order of expected use.
2014-02-24 18:14:05 -08:00
Nick Alexander
a28559b4bd Bug 975152 - Part 1: Include CrashReporter resources in Android Eclipse projects. r=bnicholson
The set of resources of all the Android library projects are processed
at once.  That means that the bi-directional dependency between the main
project resources and the crash reporter resources causes no build time
problems.  Therefore, this patch moves all the main project resources
into a library project (FennecResources) and adds an optional additional
library project (FennecCrashReporterResources).
2014-02-24 18:14:04 -08:00
Nick Alexander
bafa0e727f Bug 975152 - Part 0: Allow res=None in AndroidEclipseProjectData. r=bnicholson 2014-02-24 18:14:04 -08:00
Nick Alexander
70ae35c2c2 Bug 975622 - Part 2: Add post builder. r=bnicholson 2014-02-24 18:14:04 -08:00
Nick Alexander
7db75ef759 Bug 975622 - Part 1: Rename existing builder and target to pre. r=bnicholson
--HG--
rename : python/mozbuild/mozbuild/backend/templates/android_eclipse/.externalToolBuilders/Builder.launch => python/mozbuild/mozbuild/backend/templates/android_eclipse/.externalToolBuilders/PreBuilder.launch
rename : python/mozbuild/mozbuild/backend/templates/android_eclipse/build.xml => python/mozbuild/mozbuild/backend/templates/android_eclipse/pre_build.xml
2014-02-24 18:14:03 -08:00
Wes Kocher
b5db6f03fa Merge inbound to m-c 2014-02-24 17:45:16 -08:00
Wes Kocher
fa9c928be9 Backed out changeset 96fd88a4d311 (bug 974990) for WinXP PGO xpcshell orange
--HG--
rename : services/common/hawkclient.js => services/common/hawk.js
rename : services/common/tests/unit/test_hawkclient.js => services/common/tests/unit/test_hawk.js
2014-02-24 17:21:29 -08:00
Ryan VanderMeulen
2abee72911 Backed out changeset 2b3bda5a4744 (bug 975169) for Marionette-webapi failures. 2014-02-24 15:04:53 -05:00
Ryan VanderMeulen
c4a66fb77a Backed out 5 changesets (bug 951827) for causing bug 975820.
Backed out changeset 16b840c2de31 (bug 951827)
Backed out changeset 8fb155711dfe (bug 951827)
Backed out changeset 1109dba48e6b (bug 951827)
Backed out changeset 236ed76eea8b (bug 951827)
Backed out changeset 96cf7c13a8cb (bug 951827)
2014-02-24 14:52:14 -05:00
Gábor Molnár
49f2eb3cbb Bug 961616 - simple HTTP2 Cookie crumbling unit tests 2014-02-24 11:42:15 -08:00
Mike Habicher
739b49234d Bug 975472 - fix crash in DOM error handler, r=dhylands 2014-02-24 13:01:21 -05:00
B2G Bumper Bot
c03cf07fc8 Bumping manifests a=b2g-bump 2014-02-24 09:56:16 -08:00
B2G Bumper Bot
171519cd16 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7e08d1fefea8
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 976124 - Python update clock/alarm locator for edit panel

========

https://hg.mozilla.org/integration/gaia-central/rev/ff0ee4cb91d1
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Update DM Strings r=kaze, arcturus" for causing gaia-unit test failures

This reverts commit 1e6949eaea6cb23be1de5955fc6b0827af7b40f0.

========

https://hg.mozilla.org/integration/gaia-central/rev/220f8c0a542e
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #16567 from AndreiH/bug_976022

Bug 976022 - Intermittent test_clock_delete_alarm.TestClockDeleteAlarm

========

https://hg.mozilla.org/integration/gaia-central/rev/8d7f69f23759
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 976022 - Intermittent test_clock_delete_alarm.TestClockDeleteAlarm
2014-02-24 09:45:26 -08:00
B2G Bumper Bot
9cefc0a87a Bumping manifests a=b2g-bump 2014-02-24 09:03:04 -08:00
B2G Bumper Bot
a3a43675bc Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6c837312e085
Author: Jed Parsons <jedp@me.com>
Desc: Merge pull request #11816 from jedp/903134-mozbrowsererror

Bug 903134 - Clean up Trusted UI on mozbrowsererror; r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/2fd233067990
Author: Jed Parsons <jedp@me.com>
Desc: Bug 903134 - Clean up Trusted UI on mozbrowsererror, mozbrowserclose

========

https://hg.mozilla.org/integration/gaia-central/rev/ccee6c59b8c4
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 969413 - Make the edit mode bottom margin rule apply only to the relevant elements r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/7e89291b08ea
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #16107 from yor-mozilla-com/fix969996

Fix for bug 969996 r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/d1393f863c8b
Author: Yan Or <yor@mozilla.com>
Desc: Fix for bug 969996

Delay chunk rendering by grouping chunks into larger
sets before calling renderChunk.  First set size will
be the same as the current FIRST_CHUNK_SIZE (6).  Subsequent
sets will cap at INCREMENTAL_RENDER_SIZE (60).

The goal is to reduce reflows on rendering the call log.

Also fixed the following bugs:
  _groupCounter never gets incremented if there's only one log entry per day
  Change currDate and prevDate comparison to more readable form

Added unit tests for call log rendering of various sizes.
2014-02-24 09:02:54 -08:00
Ed Morley
56335fed17 Merge mozilla-central and b2g-inbound 2014-02-24 16:56:04 +00:00
B2G Bumper Bot
13c89b983d Bumping manifests a=b2g-bump 2014-02-24 07:57:48 -08:00
B2G Bumper Bot
e6fb59246e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3376c0645ebd
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #16370 from Rik/dsds-notification-965853

Bug 965853 - Display SIM indication in missed call notification r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/9212080ca7cd
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 965853 - Display SIM indication in missed call notification

Refactored mock_call to handle several handlers for one event type
Moved a few files to jshint linting
2014-02-24 07:57:38 -08:00
Sotaro Ikeda
77c12a9b80 backout Bug 957323 2014-02-24 07:52:04 -08:00
Ed Morley
53fd154303 Backed out changeset 49a1923db9be (bug 975792) for frequent robocop failures 2014-02-24 15:45:31 +00:00
Ed Morley
d333c12310 Backed out changeset 1f6450d61d3f (bug 975792) 2014-02-24 15:45:04 +00:00
B2G Bumper Bot
b818b7a523 Bumping manifests a=b2g-bump 2014-02-24 07:32:57 -08:00
B2G Bumper Bot
9be0074010 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/766782d40fc2
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #16516 from zacc/bug_975374

Bug 975374 - Tag python tests with tag for manual smoketests

========

https://hg.mozilla.org/integration/gaia-central/rev/3737d04237d6
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 975374 - Tag python tests with tag for manual smoketests
2014-02-24 07:32:48 -08:00
Sotaro Ikeda
4758c2311e Bug 957323 - handle android's fence on gonk r=nical,doublec,pchang 2014-02-24 07:29:43 -08:00
Carsten "Tomcat" Book
0bad0682bf merge b2g-inbound to mozilla-central 2014-02-24 12:55:53 +01:00
Carsten "Tomcat" Book
598009688f merge fx-team to mozilla-central 2014-02-24 12:54:35 +01:00
B2G Bumper Bot
73ae01ffab Bumping manifests a=b2g-bump 2014-02-24 00:06:09 -08:00
B2G Bumper Bot
36fe463ead Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/35ef07425e80
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #16507 from gasolin/issue-975350

Bug 975350 - [System] compress gUM image, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/60d15610a9ef
Author: vagrant <vagrant@precise64.(none)>
Desc: Bug 975350 - [System] compress gUM image
2014-02-24 00:00:16 -08:00
B2G Bumper Bot
d3a32c9544 Bumping manifests a=b2g-bump 2014-02-23 23:55:50 -08:00
B2G Bumper Bot
a204b1e766 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/344ecc65d805
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #15242 from mpizza/Bug_958003_demo_keyboard

Bug 958003 - resizeWindow() if we receive inputContext before init, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/aebe543ef888
Author: mpizza <mmm198219@gmail.com>
Desc: Bug 958003 - [Keyboard][V1.4] FxOS cannot pops up third party keyboard after process manager kills it
    -- after OOM keyboard will not get 'oninputcontextchange' at first time while keyboard app is using
    -- so can not only depens on 'oninputcontextchange' to show keyboard layouts.
2014-02-23 23:50:24 -08:00
B2G Bumper Bot
d9fe56b8b1 Bumping manifests a=b2g-bump 2014-02-23 23:36:28 -08:00
B2G Bumper Bot
7e7088afb4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7f07b56e7715
Author: Askeing Yen (fyen) <askeing@gmail.com>
Desc: Merge pull request #16533 from zacc/bug_975404

Bug 975404 - StaleElementException in test_ftu_skip_tour.py r=askeing

========

https://hg.mozilla.org/integration/gaia-central/rev/1f3b6f57faaa
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 975404 - StaleElementException in test_ftu_skip_tour.py r=askeing
2014-02-23 23:35:23 -08:00
B2G Bumper Bot
4047950c7e Bumping manifests a=b2g-bump 2014-02-23 22:57:02 -08:00
B2G Bumper Bot
4f25d0b52e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ae8d09b96113
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #16498 from snowmantw/issue972729

Bug 972729 - [NFC] landscape NFC shrinking UI has some issue

========

https://hg.mozilla.org/integration/gaia-central/rev/82335f78fe55
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 972729 - [NFC] landscape NFC shrinking UI has some issue
2014-02-23 22:56:14 -08:00
Maksim Lebedev
75a9a7ddd0 Bug 973660 - TEST-UNEXPECTED-FAIL AsyncPanZoomController.LongPress when touch action enabled r=drs,kats 2014-02-24 01:31:18 -05:00
Mark Hammond
640e0f3f77 Bug 973338 - add a localization note for .before and .after entities. r=ttaubert 2014-02-24 10:26:01 +11:00
Richard Newman
6a38f6e3ca Bug 975792 - Follow-up: attempting to fix bustage that only appears on tinderbox. a=test-only 2014-02-23 12:47:26 -08:00
Tom Schuster
9a72df76f8 Bug 963294 - [e10s] Implement a proxy for the color picker. r=jdm 2014-02-23 21:19:43 +01:00
William Chen
7e3d257959 Bug 856140 - Sync our document.registerElement implementation to the current version of the spec. r=mrbkap 2014-02-23 13:01:26 -08:00
Benoit Jacob
fd1ac1fb39 Bug 973192 - call XSync instead of XCloseDisplay unless NS_FREE_PERMANENT_DATA is defined - r=karlt 2014-02-23 18:03:34 -05:00
Richard Newman
6ccd2c59e3 Bug 975792 - ContentProvider tests don't clean up their cursors. r=nalexander 2014-02-23 10:53:10 -08:00
Neil Rashbrook
5b235abc21 Bug 956657 Share more charset menu code between the view source window and the browser r=Unfocused
--HG--
extra : rebase_source : 7fd31cfc4b8eefee38fa06e63351cc207a9208db
2014-02-23 18:28:04 +00:00