9c387d261e
Merge m-c to fig
...
--HG--
rename : mobile/android/base/home/PinBookmarkDialog.java => mobile/android/base/home/PinSiteDialog.java
rename : mobile/android/base/home/TopBookmarksView.java => mobile/android/base/home/TopSitesGridView.java
rename : mobile/android/base/home/MostVisitedPage.java => mobile/android/base/home/TopSitesPage.java
rename : mobile/android/base/home/BookmarkThumbnailView.java => mobile/android/base/home/TopSitesThumbnailView.java
rename : mobile/android/base/resources/color/top_bookmark_item_title.xml => mobile/android/base/resources/color/top_sites_grid_item_title.xml
rename : mobile/android/base/resources/drawable-hdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-hdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-mdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-mdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-xhdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-xhdpi/top_site_add.png
rename : mobile/android/base/resources/drawable/bookmark_thumbnail_bg.xml => mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
rename : mobile/android/base/resources/layout/home_most_visited_page.xml => mobile/android/base/resources/layout/home_top_sites_page.xml
rename : mobile/android/base/resources/layout/pin_bookmark_dialog.xml => mobile/android/base/resources/layout/pin_site_dialog.xml
rename : mobile/android/base/resources/menu/top_bookmarks_contextmenu.xml => mobile/android/base/resources/menu/top_sites_contextmenu.xml
extra : amend_source : 459360495389bad89cab14a8bd70f3dacb10d9f5
2013-09-19 13:53:14 -04:00
51c1780f21
Merge latest green fx-team changeset and mozilla-central
2013-09-19 15:39:37 +01:00
f7caecb565
Merge latest green b2g-inbound changeset and mozilla-central
2013-09-19 15:38:36 +01:00
1bf7568fb2
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9bf9368a1110
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #12155 from cctuan/911673
Bug 911673 - [system] use 'scroll from device side to screen'(scroll up) gesture to back to homescreen
========
https://hg.mozilla.org/integration/gaia-central/rev/483951ba1552
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 911673 use 'scroll from device side to screen'(scroll up) gesture to back to homescreen
2013-09-19 04:15:25 -07:00
ddd7a779e6
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b74eef52b0d0
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #12308 from gtorodelvalle/contacts-bug-916100-footer-button-not-disabled-reloaded
Bug 916100 - [Contacts] Taapping on the disabled merge button when there are not contacts selected to be merged make it to change its colour (r=jmcanterafonseca)
========
https://hg.mozilla.org/integration/gaia-central/rev/36fe8acf08df
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 916100 - [Contacts] Taapping on the disabled merge button when there are not contacts selected to be merged make it to change its colour
2013-09-19 02:55:23 -07:00
f5723714a7
Bumping gaia.json for 4 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/892887f2e1c2
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12307 from jmcanterafonseca/bug-917783
Bug 917783 - [Contacts] Email field is case sensitive when merging
========
https://hg.mozilla.org/integration/gaia-central/rev/79d6af966b4b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 917783 - [Contacts] Email field is case sensitive when merging
========
https://hg.mozilla.org/integration/gaia-central/rev/a8027db4408d
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12309 from jmcanterafonseca/bug-917684
Bug 917684 - [Contacts] Importing from SIM a contact without phone numbe...
========
https://hg.mozilla.org/integration/gaia-central/rev/ca914400218f
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 917684 - [Contacts] Importing from SIM a contact without phone number, will add an empty phone for that contact
2013-09-19 02:40:21 -07:00
e562fc4cfa
Bug 917843 - Handlify JS identifier APIs r=billm
2013-09-19 08:54:02 +01:00
607c80c4e2
Bug 917295 - GC: Handlify public date APIs r=terrence r=bz
2013-09-19 08:54:01 +01:00
692778cddf
Bug 917798 - Handlify JS exception APIs r=terrence r=bz
2013-09-19 08:54:01 +01:00
c9e20dfff0
Bug 917296 - GC: Handlify public regexp APIs r=billm
2013-09-19 08:54:01 +01:00
a33e3873a9
Bumping gaia.json for 4 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/684f7deeab97
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12304 from wanderview/contacts-css-opt
Bug 918174: Load contacts CSS from index.html
========
https://hg.mozilla.org/integration/gaia-central/rev/6c981ec2dccd
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 918174: Load contacts CSS from index.html
========
https://hg.mozilla.org/integration/gaia-central/rev/0a88a2ce13e7
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12290 from jmcanterafonseca/bug-917208
Bug 917208 - [Contacts] Phone field appears twice when merging two conta...
========
https://hg.mozilla.org/integration/gaia-central/rev/47e3f76ae9dc
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 917208 - [Contacts] Phone field appears twice when merging two contacts with same phone number
2013-09-19 00:35:22 -07:00
cb47ef771c
Bug 917706 - add tests for updating disabled/hidden values dynamically, r=test-only
...
--HG--
extra : rebase_source : b7be8eefe9387310328bc2cafe98f8ef75685447
2013-09-19 09:11:44 +02:00
60afcb7ca6
Bug 917706 - menu items and shortcuts should start working as soon as the relevant pref(s) are flipped, r=robcee
...
--HG--
extra : rebase_source : ecf03f556d09eb045bc395d36b7ae9b4ee9c66ac
2013-09-19 09:10:42 +02:00
1eec4a3e22
Merge m-c to b-i
2013-09-18 23:31:20 -07:00
ae1aa3b63e
Bug 917269 - Remove kFontAppleMyungjo; r=jdagget
...
--HG--
extra : rebase_source : 7a8ed04534c14423185c27ffdcfe2e3c64825c97
2013-09-19 02:18:33 -04:00
95c5bfc8b9
Merge m-c to m-i
2013-09-18 23:28:41 -07:00
2de877323b
Backed out 10 changesets (bug 907926, bug 911393, bug 740200, bug 917703) for b2g build bustage
...
CLOSED TREE
Backed out changeset ae02054863f7 (bug 907926)
Backed out changeset 8fcdbbc2dac2 (bug 917703)
Backed out changeset aa253a1fd7e5 (bug 911393)
Backed out changeset ec63e6d6d874 (bug 907926)
Backed out changeset 0042a2722aab (bug 907926)
Backed out changeset dc8bddfca5f1 (bug 740200)
Backed out changeset 439ff7e64d35 (bug 740200)
Backed out changeset d871c0d61510 (bug 740200)
Backed out changeset 3b248c5a0dc2 (bug 740200)
Backed out changeset 3466e81d3a41 (bug 740200)
2013-09-18 23:08:41 -07:00
7017eeaa22
Back out febd08d19087 (bug 918090) for xpcshell bustage
2013-09-18 21:47:01 -07:00
4b896261ba
Merge fx-team to m-c
2013-09-18 18:00:34 -07:00
2360c584db
Merge b2g-inbound to m-c
2013-09-18 17:09:39 -07:00
f8bb2de9f3
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/828fdfa8f465
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #12302 from KevinGrandon/bug_918122_fix_contacts
Revert "Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support" r=fabrice
========
https://hg.mozilla.org/integration/gaia-central/rev/654907243f6a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support"
This reverts commit 4cfe3660a8f293f54c111d07fca5cec6089bd32a.
2013-09-18 17:00:26 -07:00
4c170854bc
Bug 918090 - Let NeckoParent get the app:// uri when remoting file opening. r=jduell
2013-09-18 16:55:56 -07:00
bf4520a53b
Merge inbound to m-c
2013-09-18 16:48:24 -07:00
65d410b491
Bumping gaia.json for 3 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a22c634e2dda
Author: retornam <retornam@users.noreply.github.com>
Desc: Merge pull request #12272 from bobsilverberg/bug917276
Bug 917276 - Update lockscreen app and tests to address changes to the lockscreen markup
========
https://hg.mozilla.org/integration/gaia-central/rev/16c313e6aaeb
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Address review comments.
Replaced calls to launch(), changed method name, made wait_for explicit.
========
https://hg.mozilla.org/integration/gaia-central/rev/f123d13ce40e
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 917276 - Update lockscreen app and tests to address changes to the lockscreen markup
2013-09-18 16:25:22 -07:00
86cf8e531e
Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/94c99936c5f8
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 917463 - [Clock] Implement scrolling inertia in inline time picker for Timers - r=jugglinmike
https://bugzilla.mozilla.org/show_bug.cgi?id=917463
- Removes "slow down" effect when under threshold, is awkward
- Adds "inertia" by detecting the speed of the last pan event when a swipe finishes and adjusts the index properly
- Separated out the "stopInteraction" method from the onswipe
2013-09-18 14:50:22 -07:00
e3051f9e2b
Bug 907926 - Enable Azure content for windows. r=nrc
2013-09-19 09:32:15 +12:00
94c52f8921
Bug 917703 - Avoid copying to a sub image in CreateSamplingRestrictedDrawable if possible. r=roc
2013-09-19 17:23:31 +12:00
8f15230644
Bug 911393 - Do not fallback for EXTEND_PAD when not needed. r=jrmuizel
2013-09-19 17:23:30 +12:00
421b980674
Bug 907926 - Avoid calling CurrentSurface when we can. r=Bas
2013-09-19 17:23:30 +12:00
4dae853ee1
Bug 907926 - Try avoid having multiple path objects around since this is slow with DrawTargetCairo. r=Bas
2013-09-19 17:23:30 +12:00
066b8b3045
Backing out f4ddfbf313fc (bug 905405) on a CLOSED TREE
2013-09-19 17:16:17 +12:00
6355ddd089
Backed out changeset bf8d5d78b27e
2013-09-19 17:15:18 +12:00
10216e7984
Fix build bustage for bug 905405 on a CLOSED TREE
...
--HG--
extra : rebase_source : c7b1d98d7c828e95905080270f5da2f242923eff
2013-09-19 16:51:24 +12:00
612bc35f0e
Bug 740200 - Azure support in nsWindow; r=mattwoodrow
2013-09-19 16:29:51 +12:00
269747bcb6
Bug 740200 - Azure content rendering on Linux; r=roc
2013-09-19 16:29:51 +12:00
16051488eb
Bug 740200 - BorrowedContext support for cairo; r=mattwoodrow
2013-09-19 16:29:51 +12:00
d6eaee854e
Bug 740200 - Removed some white space
2013-09-19 16:29:51 +12:00
c797ee1772
Bug 740200 - Enable content pref; r=mattwoodrow
2013-09-19 16:29:51 +12:00
9588456df8
Address review comments for bug 905909. r=dholbert
2013-09-19 16:30:30 +12:00
0ac1b39ab6
Bug 905405. Wrap mLastNativeEventScheduled in a mutex to avoid racing on it. r=bsmedberg
2013-09-19 16:24:34 +12:00
81d19c4037
Bug 918185. When Range.getBoundingClientRect/getClientRects needs a textframe for a node, create one if the textframe was optimized away. r=bz
2013-09-19 16:23:48 +12:00
45f46cfbcb
Bug 917455: Use a single cursor for the grid and the list. [r=lucasr]
2013-09-18 17:30:01 -04:00
f3e7db6940
Bug 917455 - Update top sites behaviour for about:home's Top Sites panel (r=wesj)
2013-09-18 17:56:32 -04:00
38c34f2e19
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d56c46fdd8f9
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #12253 from nullaus/agps-unit-tests
bug 891732 - AGPS/SUPL Operator Variant Unit Tests. r=jaoo
========
https://hg.mozilla.org/integration/gaia-central/rev/d3e7c3670930
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 891732 - AGPS/SUPL Operator Variant Unit Tests.
r=josea.olivera
2013-09-18 14:15:24 -07:00
3119782e04
Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8547bf51868f
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #11995 from bobsilverberg/settings_bluetooth_test
Bug 917946 - Add Gaia-marionette tests for the settings app
========
https://hg.mozilla.org/integration/gaia-central/rev/6eedcfd6ddca
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 917946 - Add Gaia-marionette tests for the settings app
Create base app object
Create settings app object
Create bluetooth and do not track panel regions
Create sample tests for bluetooth and do not track settings
2013-09-18 12:40:22 -07:00
a5064fa8a6
Bug 910191/913402 - Don't use OnPreDrawObserver on pre-HC devices (r=sriram)
2013-09-18 14:50:22 -04:00
5e407a0ed3
Bug 916588 - Show default favicon when we bail in FaviconView.formatImage. r=margaret
2013-09-18 13:47:35 -04:00
4f5419529d
Bug 835808 - Navigate with arrow keys in computed view; r=harth
2013-09-18 10:43:11 -07:00
d639c2867e
Bug 917455 - Revert getTopBookmarks back to getTopSites. r=wesj
2013-09-18 13:32:22 -04:00
ed2f5b0505
Bug 917310 - Fix app install path for b2g r=fabrice
...
--HG--
extra : transplant_source : i3%A2%FD%A5c%BDc%F7%AA%3AP%98%D5%F3%E3Okr%09
2013-09-18 10:25:06 -07:00
Lucas Rocha
Ed Morley
Gaia Pushbot
Jon Coppeard
Gijs Kruitbosch
Phil Ringnalda
Ehsan Akhgari
Wes Kocher
Fabrice Desré
Matt Woodrow
Bas Schouten
Robert O'Callahan
Anthony Jones
Sriram Ramasubramanian
Chris Kitching
Patrick Brosset
Margaret Leibovic
Alexandre Poirot