Commit Graph

20205 Commits

Author SHA1 Message Date
Michael Comella
223d958663 Bug 1267468 - Replace FileUtils.getFileContents with read*FromFile. r=sebastian
Reasons for replacement:
 * The old method was untested
 * The Scanner class is supposedly slower than using Streams directly (which
the new methods do)
 * If possible, it's generally better not to duplicate solutions - using the
Scanner works around the infrastructure this changeset series built (i.e. using
Streams).

In the edge cases, getFileContents:
 * throws NoSuchElementException for empty files. The new behavior is to return
the empty string. Since getFileContents was always wrapped by `new JSONObject`
or similar, and we throw when the file is empty, the behavior should stay the
same.
 * throws NoSuchFileException for missing files. This is the same as the
new behavior.

MozReview-Commit-ID: 6ESPss29emU

--HG--
extra : rebase_source : 24af07bddd585b857ebd8eb4eff4c7ac4898ba37
2016-04-26 15:36:04 -07:00
Michael Comella
5d71ac6741 Bug 1267468 - Add additional details & tests for writeStringToFile. r=sebastian
MozReview-Commit-ID: 5yJE4VMyBwV

--HG--
extra : rebase_source : b14eb8e310a68fcd7b6e7dd7c0a918d1c21caebe
2016-04-26 15:46:56 -07:00
Michael Comella
a265b2f532 Bug 1267468 - Move readJSONObjectFromFile -> FileUtils. r=sebastian
MozReview-Commit-ID: GVlOS3UJ1HS

--HG--
extra : rebase_source : 76375110ca9e81cd633dc3a2b58d1c28cc1a222c
2016-04-26 15:16:07 -07:00
Michael Comella
e003c5926e Bug 1267468 - Add readStringFromFile and test. r=sebastian
This method duplicates an existing method (readFileContents) which will later
be removed.

MozReview-Commit-ID: 2aVf74KvYyP

--HG--
extra : rebase_source : 3aa814f3e227fba4c5bab9434894aef6178da333
2016-04-26 15:14:52 -07:00
Michael Comella
c25e0d04f1 Bug 1267468 - Add readStringFromInputStream... and test. r=sebastian
Javadoc in this commit references a method that is not yet added.

MozReview-Commit-ID: Hc0MSLYTQgD

--HG--
extra : rebase_source : bb30eb579fd8450a0b4698d38333b468f3b6e372
2016-04-26 15:01:10 -07:00
Michael Comella
0ab4aa27ba Bug 1267468 - Move test writeJSONObjectToFile -> FileUtils. r=sebastian
MozReview-Commit-ID: GRVzaHYbEhI

--HG--
extra : rebase_source : b3b50ced4fa0b4fd593da2a9187812647d8c55ba
2016-04-25 17:25:48 -07:00
Michael Comella
ff379f30b0 Bug 1267468 - Add FileUtils.writeString to Stream & file with tests. r=sebastian
I would have separated these methods but version control fail.

MozReview-Commit-ID: 7og2iBKqHiH

--HG--
extra : rebase_source : 62db6247aedfc3683249f093a8d3688e6408ab17
2016-04-26 11:53:41 -07:00
Grigory Kruglov
6624cffcb3 Bug 1265525 - Part 2: Frecency calculation and top sites query updates r=sebastian
MozReview-Commit-ID: 7tqr4IT9635

--HG--
extra : rebase_source : c7a3c17b9520317bfe9dbb7ee91841844fd89000
2016-04-27 10:43:21 -07:00
Grigory Kruglov
4d27766eb6 Bug 1265525 - Part 1: Combined view migration, add local/remote visit aggregates r=sebastian
MozReview-Commit-ID: 211xyvAJbtd

--HG--
extra : rebase_source : 1007e816f9f26d2ef5e1000aaf1c9713a0f644db
2016-04-19 12:40:12 -07:00
Grigory Kruglov
d81d7764d1 Bug 1265525 - Pre: move BrowserContract tests to junit4 r=sebastian
MozReview-Commit-ID: 6GLqAR2SOKi

--HG--
extra : rebase_source : 81b486dac92c35be2dcba157bb6f86c1169367cc
2016-04-18 14:04:36 -07:00
Carsten "Tomcat" Book
bfa6750d68 Merge mozilla-central to fx-team 2016-04-27 13:56:49 +02:00
Sebastian Kaspari
efa3e84b16 Bug 1228680 - Replace default favicon with generated version. r=ahunt
MozReview-Commit-ID: L0vd0v8wOUK

--HG--
extra : rebase_source : cb780daa5287e48c3b8e0d7daeae20c2aeeb0625
2016-04-25 16:28:42 +02:00
Sebastian Kaspari
a0a151ce88 Bug 1228680 - Introduce FaviconGenerator to generate favicons based on URLs. r=ahunt
MozReview-Commit-ID: Aww2wxSTfD6

--HG--
extra : rebase_source : 4d9e4cdd91831d973fd870c3e7383cdd529d3d9c
2016-04-25 16:10:15 +02:00
Timothy Guan-tin Chien
e3df65a0b0 Bug 1266372 - De-dup code to ReaderMode.leaveReaderMode, r=gijs
Additionally, implements ReaderMode.enterReaderMode.

MozReview-Commit-ID: 8MPvFhX4ws7

--HG--
extra : transplant_source : %91%0D%CEZkOO%90%1C3%A24%3E%9Bq%D5%BB%13F%0A
2016-04-26 12:52:50 +08:00
Carsten "Tomcat" Book
9b5c28ac41 Backed out changeset cc427bee3a5a (bug 1259598) for likley causing a bustage again 2016-04-26 14:31:34 +02:00
Victor Ng
51c999ae4b Bug 1259598 - "Add new information fields to geolocation stumbles". r=michelangelo sr=hschlichting 2016-04-22 11:36:00 +02:00
Ting-Yu Lin
25bc4aacc1 Bug 1268410 - Change the default value of "layout.accessiblecaret.timeout_ms" to 0. r=mats
That is, the single caret in cursor mode will always persist on all
platforms as on Firefox Android.

MozReview-Commit-ID: 5MTCf1n2dF3

--HG--
extra : rebase_source : 4062752d7c781acc19088106028e848d1192f880
2016-04-28 20:21:23 +08:00
Andrea Marchesini
1c0c183890 Bug 1261009 - Remove the Data Store API, r=fabrice 2016-04-29 09:02:45 +08:00
Kartikaya Gupta
3a52fb3c8d Bug 1268122 - Guard against layerview destruction between the compositor update task being posted and it running. r=snorp
MozReview-Commit-ID: HJIFbcduj6E

--HG--
extra : rebase_source : d44fd7542938b170bf5ac73229a71158b941f482
2016-04-28 15:03:02 -04:00
Sebastian Kaspari
771a9b39d1 Bug 1265497 - FaviconView: New favicon background with rounded corners. r=ahunt
MozReview-Commit-ID: Fj1YRU2fZYF

--HG--
extra : rebase_source : d7f83bad145b576debbf7915a0e380bebcf003b8
extra : amend_source : 20cd17fbb1eee5748d101eb877bff82365fa71e9
2016-04-20 17:28:48 +02:00
Mark Capella
2895e6d778 Bug 1267383 - Followup Telemetry from Bug 1257843, Text Selection Probe, r=sebastian 2016-04-26 04:09:21 -04:00
Wes Kocher
d509baac11 Merge inbound to central, a=merge
MozReview-Commit-ID: 4igUgM6r0wO
2016-04-25 17:11:09 -07:00
Sebastian Kaspari
155c96ed46 Bug 1266383 - Do not show HomeScreenPrompt if tab is not in foreground. r=ahunt
MozReview-Commit-ID: 1j7FKOfVt0X

--HG--
extra : rebase_source : 2f1c48275a28fb16a13cdb28e8856837a2345154
2016-04-21 19:36:22 +02:00
Sebastian Kaspari
27818ed42c Bug 1266383 - (Pre) BrowserAppDelegate - Add methods for tabs tray shown/hidden. r=ahunt
MozReview-Commit-ID: JGL9EtRBKy0

--HG--
extra : rebase_source : 80d65fcdb85559de8dccb471f999938d57fce177
2016-04-21 17:51:42 +02:00
Sebastian Kaspari
daad2ea611 Bug 1266477 - Migrate screenshot observer code to class extending BrowserAppDelegate. r=mcomella,ahunt
MozReview-Commit-ID: FoIfEhmd4mN

--HG--
extra : rebase_source : 1f2780026d1e2638dd925d33a851c12e8f32420b
2016-04-21 16:20:32 +02:00
Sebastian Kaspari
9f97fcf2ff Bug 1266477 - Migrate AddToHomeScreenPromotion to extend BrowserAppDelegate. r=mcomella,ahunt
MozReview-Commit-ID: 5YuudrL7hLh

--HG--
extra : rebase_source : d0cbbc20b178ffe99800b04384387c52997a9339
2016-04-21 16:11:49 +02:00
Sebastian Kaspari
f233e22238 Bug 1266477 - Introduce BrowserAppDelegate to extend the behavior of BrowserApp. r=mcomella,ahunt
MozReview-Commit-ID: 2voLpgEOcW

--HG--
extra : rebase_source : 8c2f70c4911c11bf5b2594398235ef139ea3d475
2016-04-21 15:40:20 +02:00
Jim Chen
3c7335f315 Bug 1256147 - Initialize EditorInfo even when IME is not active; r=esawin
Initialize the EditorInfo object even when we return null in
onCreateInputConnection. This fixes the bug for the Samsung keyboard on
Galaxy S7.
2016-04-25 12:51:12 -04:00
Jim Chen
e01a6c6646 Bug 1256147 - Post to UI thread for all showSoftInput calls; r=esawin
Make showSoftInput always post to the UI thread for consistency.
2016-04-25 12:51:12 -04:00
Jim Chen
c19d3510f8 Bug 1256147 - Show/hide keyboard in onCreateInputConnection; r=esawin
Showing and hiding the keyboard in onCreatInputConnection avoids a
possible race with resetInput in notifyIMEContext, and it replaces the
"show keyboard on window refocus" hack that we had before.
2016-04-25 12:51:12 -04:00
Carsten "Tomcat" Book
84eb46bafd merge mozilla-inbound to mozilla-central a=merge
--HG--
rename : toolkit/components/prompts/test/test_bug861605.html => toolkit/components/prompts/test/test_dom_prompts.html
2016-04-25 11:55:12 +02:00
Michael Kaply
6f9b7ee4bc Bug 1266080 - Move Google engines together in list; r=margaret 2016-04-24 22:22:21 -05:00
Timothy Guan-tin Chien
b6755044e2 Bug 1264805 - [Fennec] Use goBack to leave the reader view when possible. r=margaret
MozReview-Commit-ID: 79wpix8njxT

--HG--
extra : rebase_source : b9c39cab14bad48362f30fce30629c7129af18b2
2016-04-20 12:11:44 +08:00
Andrzej Hunt
63cf5690a2 Bug 1263571 - Post: make checkstyle happy r=me
MozReview-Commit-ID: GvcUZz2Jd4w

--HG--
extra : rebase_source : 6557841de66a857b14ade56b9ff404098ed3ce70
extra : source : a3b0aafbc909236da4521c06970128874b627894
extra : histedit_source : 8c99e692e7f286f29aad56aaa6dde39f8f862490
2016-04-24 20:29:57 +02:00
Andrzej Hunt
b16d4df72f Bug 1246238 - Post: make checkstyle happy r=me
MozReview-Commit-ID: JJ2PK3jka5e

--HG--
extra : rebase_source : b2057d66d59da7c8eb72ec132a1fd89033a7e4c0
extra : source : f711b0c364a5773671c3d767824481b1149a004e
extra : histedit_source : df79029f06a6629aed09f827295bb21bd631697f
2016-04-24 20:30:39 +02:00
Johann Hofmann
1037e910fa Bug 874408: Join safe browsing, add download protection to security prefs. r=gcp,francois,past
MozReview-Commit-ID: L6ZmvTmndml
2016-04-24 15:40:21 +03:00
Andrzej Hunt
d45e92ae14 Bug 1246238 - Show helper UI first time a reader view page is bookmarked r=sebastian
MozReview-Commit-ID: JeHr7eZTKc

--HG--
extra : rebase_source : c514c6ee443c26fba5e74bbbb5bedc3a8522fa68
extra : source : a8accf120ce99f97624c77dea88266be694c3f15
2016-04-20 21:27:30 +02:00
Andrzej Hunt
f2c30c0d28 Bug 1246238 - Pre: Implement SimpleHelperUI r=sebastian
This provides a basic helper UI that can be customised with images/text.
We need a very similar helper for both reader-view offline bookmarking related
helpers (Bug 1236328 and Bug 1247689), hence it's useful to have a common
class implementing most of the required functionality.

Most of the new helper is borrowed from the existing HomeScreenPrompt. I will
extract the common functionality in a followup Bug.

MozReview-Commit-ID: Byc5VnVFffj

--HG--
extra : rebase_source : 1e20ab501f47dbdfd17d243ce8db4676ac841ab4
extra : source : b52ab3637d1e0eadd3c465a541324a74e6461af3
2016-04-23 10:56:17 +02:00
Nathan Froyd
8be5decf3c Bug 1220307 - part 3 - enable Rust in ARM Android nightly and debug builds; r=nalexander,margaret
--HG--
extra : rebase_source : e2acc3dda7faa28ba63b9f19d0af29f7e9dfdab5
extra : source : d74e9d5a64c352187ab74b60255b571f6192a0e5
2016-05-06 14:09:36 -05:00
Nathan Froyd
2fe37f3524 Bug 1220307 - part 1 - Rust tooltool packages for ARM Android builds; r=mshal
--HG--
extra : rebase_source : 1c7436e0696e561f18f03ebb60f0b9004d318cef
extra : source : b3397e0d5d8d85b05637c03b141c532e6c3ad065
2016-05-06 15:09:36 -04:00
Wes Kocher
cfb9b30727 Backed out 3 changesets (bug 1220307) for failures in test_dialogArguments.html and test_iframe_sandbox_modal.html
Backed out changeset d74e9d5a64c3 (bug 1220307)
Backed out changeset 4e5db23bc712 (bug 1220307)
Backed out changeset b3397e0d5d8d (bug 1220307)
2016-05-06 12:38:36 -07:00
Nathan Froyd
ffbbcc981b Bug 1220307 - part 3 - enable Rust in ARM Android nightly and debug builds; r=nalexander,margaret 2016-05-06 14:09:36 -05:00
Nathan Froyd
0302f85f89 Bug 1220307 - part 1 - Rust tooltool packages for ARM Android builds; r=mshal 2016-05-06 15:09:36 -04:00
Geoff Brown
ab13fa6cc1 Bug 1261270 - Remove APZ/nightly test annotations for robocop; r=me 2016-04-27 14:56:11 -06:00
Kim Moir
54248e8cea Bug 1186522 - force per checkin and release desktop firefox builds to require signed add-ons on beta 47 r=mshal 2016-04-27 12:46:52 -04:00
James Willcox
44ba33aedc Bug 1181822 - Enable fading tiles on Android Nightly r=antlam,me 2016-04-27 09:12:43 -05:00
Jim Chen
5fc36a4e06 Bug 1270201 - Change first Gecko argument to package name; r=snorp
The first argument (argv[0]) to Gecko should be the program name, not
the apk name. For Android, the program name is the package name.
2016-05-05 11:39:03 -04:00
Andrzej Hunt
82dca3776e Bug 1263571 - Update switch-to-tab for reader view pages too r=liuche
MozReview-Commit-ID: 6qKDBy2P4nK

--HG--
extra : rebase_source : cbff68d2e8b49963c7df92de6086d6098f96cbba
extra : histedit_source : 8031b76d5745a75e2dc92001b2a673a34e08df68
2016-04-12 10:58:10 -07:00
Andrzej Hunt
994f8192f5 Bug 1263571 - Pre: onTabChanged data is always a String, declare it as such r=liuche
We're always using this as a String, we might as well make this explicit to avoid having to cast
anywhere. (We very rarely use the parameter, but some new code in the main part of Bug 1263571
would have to cast this to a String. We can avoid that if we just use the correct type.)

MozReview-Commit-ID: H8JdMzQtmRI

--HG--
extra : rebase_source : 4cdad694c54e94fce1c108dadde22d3cd3fc4b60
extra : histedit_source : e094d203b2ba5273cdc219e63d92e2bf2de8603e%2C9cbcd9464c1a19fecbfb1f60daa39b2d53c9da4a
2016-04-23 10:32:54 +02:00
Andrzej Hunt
fa5e0ad7ba Bug 1263571 - Pre: cleanup imports r=me
MozReview-Commit-ID: 8KdYp5gHEVR

--HG--
extra : rebase_source : d09c620417eefdc9f23187a4e0795df3fdf04c89
2016-04-12 10:48:55 -07:00
Grigory Kruglov
22abdf585b Bug 1266232 - be extra careful and mindful of performance when migrating visits r=mcomella
1) Use prepared SQL insert statement for insertions
1.2) Use ON CONFLICT IGNORE for our inserts, to avoid failing on possible data clashes
2) Don't synthesize "visits since last sync" - it's bound to cause problems, for not much benefit
3) Fix up some minor issues, cleanup code and add sanity checks
4) If there's evidence Sync was enabled at some point, mark synthsized visits as remote. Otherwise, as local.

MozReview-Commit-ID: Gd94A6r4rW

--HG--
extra : rebase_source : e4f74e3d1d286e1107e5a1764ae8ea3fd5ff3ff2
2016-04-22 23:18:04 -07:00
Michael Comella
029b25ac6a Bug 1266820 - Disable Screenshot in Bookmarks feature. r=grisha r=grisha
See code comment (and related bug) for details.

MozReview-Commit-ID: EDzIBftjJRU

--HG--
extra : rebase_source : 94721323a4372010941dcce034093d3f0d1ac95c
2016-04-22 11:23:36 -07:00
Mark Capella
d720d7d792 Bug 1257843 - Probe to measure when user enters text selection UI, r=sebastian 2016-04-22 16:44:47 -04:00
Grigory Kruglov
24a83ce171 Bug 1265979 - missing call to provider.shutdown() causing test failures r=sebastian
MozReview-Commit-ID: 3jJTDKGtXok
2016-04-22 13:34:31 -07:00
Sebastian Kaspari
46b5b88e2d Bug 1261836 - Content notifications: Check if new content is already in history. r=mcomella,mfinkle
If the URL of new content is already in the user's history then we won't show a notification
for it.

MozReview-Commit-ID: B26SBvXOnxY

--HG--
extra : rebase_source : 5fe3d6ad40939bfe5e842d075c1b0abc1226ac10
2016-04-13 13:01:52 +02:00
Margaret Leibovic
32cd130e13 Bug 1257513 - Remove bookmark-history-menu experiment, show menu items by default. r=liuche
MozReview-Commit-ID: 9mT8eOABokH

--HG--
extra : rebase_source : 055a65ca06f81f833ace46a2726cbbded619e083
2016-04-19 18:35:50 -04:00
Carsten "Tomcat" Book
461379e456 merge mozilla-inbound to mozilla-central a=merge 2016-04-22 15:56:10 +02:00
Sebastian Kaspari
4d4e8baaee Bug 1266668 - Remove Nightly flags from new ActionBar and floating text selection. r=capella
MozReview-Commit-ID: KpIJeCn2Gj4

--HG--
extra : amend_source : 66eb4430e2bde29b50a15d7183c5c28dff442ce5
2016-04-22 12:19:23 +02:00
Carsten "Tomcat" Book
72c1e6f5ac Backed out changeset 2271b0c11307 (bug 1033450) for crashtest failures
--HG--
extra : rebase_source : 47e1b5bf38d1d8e531e6c341c2d1c1051fd5c58d
2016-04-22 10:37:40 +02:00
Carsten "Tomcat" Book
c5e089ec4e Backed out changeset 1b5ef8bb25d8 (bug 1259598) for bustage 2016-04-22 06:57:05 +02:00
dimi
e56e41f353 Bug 1033450 - consolidate safebrowsing prefs in all.js. r=francois
MozReview-Commit-ID: IKQ1wPHOY17

--HG--
extra : rebase_source : 62bce62fcb9781b6e99c1c43f15ee13e27d77e5e
2016-04-14 15:49:17 +08:00
Carsten "Tomcat" Book
23bcfcba57 Backed out changeset f71acdbd0d45 (bug 1033450) for wrong patch landed
--HG--
extra : rebase_source : a8c1947330e0f156410b6095ff91e0c723f6b50e
2016-04-22 06:01:11 +02:00
Carsten "Tomcat" Book
55fea48a3f Backed out changeset 637e80ab4fca (bug 1262755) for rc4 android perma failures
--HG--
extra : rebase_source : 26893c1afaa1c4fc23808b92d8738d847d9ff5f3
2016-04-22 09:12:50 +02:00
Victor Ng [:vng] [:crankycoder]
fe18320467 Bug 1259598 - "Add new information fields to geolocation stumbles". r=michelangelo sr=hschlichting 2016-04-09 05:34:00 +02:00
Wes Kocher
6d4a2cf6c0 Merge m-c to fx-team, a=merge
MozReview-Commit-ID: m0xI0OSGys
2016-04-21 15:03:13 -07:00
Wes Kocher
aac511837d Merge inbound to m-c a=merge
MozReview-Commit-ID: GW9vcSRPgYc
2016-04-21 14:41:08 -07:00
Chenxia Liu
1810ec6aad Bug 1262343 - Add reference to remote tabs empty layout for future use. r=sebastian
MozReview-Commit-ID: LUnrurHtdlY

--HG--
extra : rebase_source : d4203987e8f9de50a9f837c2de1246955b1f8f9c
extra : histedit_source : ec8b1c5b177b55c1a7886c05097b4f2dcad517a3
2016-04-20 17:28:53 -07:00
Chenxia Liu
27a0c4c5ee Bug 1262343 - Remove old Synced panel code. r=sebastian
MozReview-Commit-ID: FjRaX14gJ17

--HG--
extra : rebase_source : a5648748db28e6f2618bf8b0e447225b2ff371ee
extra : histedit_source : 5db443112959057f8e27f70891540cc26c9180da
2016-04-20 11:55:48 -07:00
Chenxia Liu
499725892b Bug 1262343 - Remove old History panel code. r=sebastian
MozReview-Commit-ID: LZX264R3H35

--HG--
extra : rebase_source : 9fd38cb4682055bf20ce6c5786ad6cb0a98b820d
extra : histedit_source : d72847bb324ac14026fbe16b678616279c34472a
2016-04-20 11:41:49 -07:00
Chenxia Liu
f0fb70d663 Bug 1263941 - History is not displayed in the 3-dot menu if History panel is set as default after it was hidden. r=sebastian
MozReview-Commit-ID: 1hSKJd0r0fv

--HG--
extra : rebase_source : a9e9a1e75b36d3e40523b9ca7f16785e0ab5a67f
2016-04-20 11:03:35 -07:00
Margaret Leibovic
260d62a846 Bug 1246988 - Update Bing icon for Search. r=sebastian
MozReview-Commit-ID: 77BPBznFeYG

--HG--
extra : rebase_source : ffaa54cb489b474d84d6b3f643be180f1209880d
2016-04-20 10:52:22 -04:00
Wes Kocher
c65b052530 Merge m-c to inbound, a=merge
MozReview-Commit-ID: Aas4kEyBseh
2016-04-20 14:19:25 -07:00
Nathan Froyd
681b252385 Bug 1266197 - fix robocop warning about nsIDOMWindowInternal; r=gbrown
The warning message tells us to just use nsIDOMWindow, so let's do that.
Less warning spam is a win.
2016-04-20 16:32:15 -04:00
Jim Chen
983f3c49d1 Bug 1252650 - Send event response even if GeckoApp is not active; r=me
Enable sending event response when Gecko state is PROFILE_READY. This
happens when Gecko is loaded in the background and GeckoApp is not
active. This is safe because it's only a response to an event from
Gecko, so there is definitely a listener for the response on the Gecko
side already. r=me for a trivial change.
2016-04-20 15:06:13 -04:00
Jim Chen
4018bd63a8 Bug 1252650 - Use GeckoService to launch Gecko for incoming push messages; r=nalexander
Use GeckoService to launch Gecko using the correct profile and load push
service, if necessary.
2016-04-20 15:06:13 -04:00
Jim Chen
99c7d96804 Bug 1252650 - Add GeckoThread.canUseProfile; r=snorp
canUseProfile returns whether we're currently using the given profile or
we can potentially start Gecko with the given profile.
2016-04-20 15:06:13 -04:00
Jim Chen
dc18692d89 Bug 1252650 - Add intent to create XPCOM services in GeckoService; r=snorp
Add support for Intents that launch GeckoService and create services
based on a category registered with the category manager.
2016-04-20 15:06:13 -04:00
Andrzej Hunt
9187edc788 Bug 1264381 - Add comment explaining lack of SQLite forward-compatibility r=mcomella
MozReview-Commit-ID: J84s62BsoPJ

--HG--
extra : rebase_source : 024fbb89590f35beeec577028e4f199a363d836e
2016-04-13 11:16:51 -07:00
dimi
8cd19f9a1f Bug 1033450 - Consolidate safebrowsing prefs in all.js. r=francois
MozReview-Commit-ID: EA2H08dlCLl

--HG--
extra : rebase_source : 9dfa4af8b71b48c7841b3d5d07c106e24ae0ee05
2016-04-20 00:44:52 -07:00
Grigory Kruglov
c48450bfbd Bug 1265971 - Style fix to make checkstyle happy r=grisha
MozReview-Commit-ID: FjqK8T5IcEt

--HG--
extra : transplant_source : %E3%A8L%3C%AE%0E%00%052T%8D%E9%1Bx%A7%7B%95V%E6%A1
2016-04-19 23:12:27 -07:00
Mathieu Leplatre
93af383736 Bug 1257556 - Generalize Kinto blocklist client to addons/plugins/gfx. r=MattN
MozReview-Commit-ID: DkiNF78QTId

--HG--
extra : transplant_source : %90K%5D%89%3AZW%CC%97%FE%BF%D9%CD%A5%F8%18%08%85%B02
2016-04-18 11:38:25 +02:00
Grigory Kruglov
53f2edfa45 Bug 1046709 - Post: remove dead code r=nalexander
MozReview-Commit-ID: K75KTg6pDEV

--HG--
extra : transplant_source : %93%E6%25%C9%C2%EF%96%11%E2%90%04%E9g%0A%CA%15%B9zo%AA
2016-04-07 19:08:42 -04:00
Grigory Kruglov
a8a4a8f16c Bug 1046709 - Part 5: Delete history db extensions related stuff r=nalexander,rnewman
- class
- tests

MozReview-Commit-ID: LwHo5Ej2FGS

--HG--
extra : transplant_source : %DFt%9B%C6gy%F3q%90%7Fc%FE%22%B5%BD%F85%FE%E4%1A
2016-04-12 15:52:53 -07:00
Grigory Kruglov
774870136d Bug 1046709 - Part 4: Sync changes r=nalexander,rnewman
- insert/merge visits on "sync down"
- ensure to attach visits on "sync up"
- tests

MozReview-Commit-ID: 4OmyQS5JSm7

--HG--
extra : transplant_source : %F0%A8fs%AB%90%EC%2C-%8B%7D1%E1h%FF%97%DAVT%28
2016-04-13 16:33:36 -07:00
Grigory Kruglov
9fed9fc7bf Bug 1046709 - Part 3: Synthesize visits when importing history from Android r=nalexander,rnewman
MozReview-Commit-ID: Fcw5lygXbem

--HG--
extra : transplant_source : %D1%D4%98%DB30%8B%E8%F7%27%3DG%DC%0C%89%0E%D6%C7%A7%F8
2016-04-12 15:44:27 -07:00
Grigory Kruglov
1dab7ae855 Bug 1046709 - Part 2: CRUD for Visits - query/insert/delete; tests. r=nalexander,rnewman
Note: need to set package name in robolectric.properties so that Robolectric reads correct resources

MozReview-Commit-ID: 6wrh8kzJlXI

--HG--
extra : transplant_source : %86T%8BUB%ABe%0A%DF8%F0%81%0C%ACi%D1Rx%E2%EC
2016-04-16 02:19:53 -07:00
Grigory Kruglov
1ab053d2cf Bug 1046709 - Part 1: schema migration, data migration, test db r=nalexander,rnewman
MozReview-Commit-ID: 2kI4ps6rOOV

--HG--
extra : transplant_source : %EE%A1E%CD%01%0B%9B%96%DB%19%8A%AF%7C%89%E0ooR%0CQ
2016-04-18 15:13:06 -07:00
Jan Henning
a72cf7f810 Bug 1264717 - Part 1 - Add some debug logging to the session store. r=margaret
The logging can be enabled by setting "browser.sessionstore.debug_logging" in about:config.

MozReview-Commit-ID: DCJevcsg549

--HG--
extra : transplant_source : %E3%166%F7%0C%29%C0%FB%0A6E%02Sd%10%9D%9A%5DN%7D
2016-04-18 20:59:50 +02:00
Jan Henning
0eac5af72a Bug 1264717 - Part 0 - Get rid of unbraced ifs in sessionstore.js. r=margaret
MozReview-Commit-ID: CU36X2BD3Q

--HG--
extra : transplant_source : %FC%BA%D7X%14%A2%12Wl%C1%1Cb%94c%E8%3D%C9%CAYL
2016-04-14 17:58:41 +02:00
Shatur
31ec617e18 Bug 1250387 - Kill GckoConnectivityReceiver.java and improve GeckoNetworkManager.java r=grisha 2016-04-19 06:31:17 +05:30
Jan Henning
22714614cb Bug 1218317 - Retrieve the file size for finished downloads. r=margaret
MozReview-Commit-ID: 2TbC3rs0RyH

--HG--
extra : transplant_source : %F2%09%F6e%0D%8BX%CCl%5BU%95%FDzP%A9%92%FC%27%96
2016-04-18 21:31:17 +02:00
Sebastian Kaspari
a50e179260 Bug 1266340 - Explicitly close menu when finishing action mode. r=capella
MozReview-Commit-ID: LZiufFsemS1

--HG--
extra : rebase_source : cdfa6282b9df2c971215ed4516247a2b04033d9d
2016-04-21 14:28:58 +02:00
Mark Capella
a5dadf5639 Bug 1265750 - Some word cannot be selected via long pressing, r=TYLin, mats 2016-04-21 08:53:13 -04:00
Mark Capella
7e8a94cb54 Bug 1245831 - The action bar animation is overlapping with the three dot menu. r=sebastian
MozReview-Commit-ID: J0QXMhfZWt7

--HG--
extra : rebase_source : 275d3d24e170afff500bd43b34f62b6441bc546a
2016-04-21 13:11:46 +02:00
Andrzej Hunt
3d195e4e1f Bug 1266104 - Ensure SavedReaderViewHelper is loaded for recent tabs panel r=margaret
I wonder if there is a better solution to guarantee we have the necessary data loaded, however
this seems to be the only special case (i.e. the only place we use TwoLinePageRow without
the DB having been loaded first).

MozReview-Commit-ID: F4iAIpe87IY

--HG--
extra : amend_source : 798700a320878d440bac4a6af7a5438601f3fe36
2016-04-20 22:02:49 +02:00
Andrzej Hunt
4718e06787 Bug 1265908 - Avoid NPE with empty selection r=grisha
It is possible and valid to have a null selection. All other manipulations
are null-safe, and we need to be able to handle the null-case when testing for
annotations being part of the selection.

MozReview-Commit-ID: Fpnt2NX1BmV

--HG--
extra : rebase_source : f08a3219e581696594381cbdf10c5dd5d2c8359f
extra : amend_source : d0c9b7050d6792c0923deb9e7896e6839d91b169
2016-04-20 09:58:03 +02:00
Grigory Kruglov
62e1e8c0d2 Bug 1266162 - Don't throw during migration upon encountering a strange visits count r=grisha
Sync is vast and could be strange, so let's allow for some weirdness in numbers and recover gracefully.

MozReview-Commit-ID: 6o6SdcvmK8x

--HG--
extra : amend_source : 89f690a0688e8fcef83839bfc232af2b8763c90f
2016-04-20 12:12:53 -07:00
Sebastian Kaspari
c580d240d5 Bug 1264868 - Handle ACTION_VIEW_MULTIPLE intent when creating BrowserApp. r=mcomella
MozReview-Commit-ID: 9WlTn8GcAev

--HG--
extra : rebase_source : 7b1eb093c71f9a59fe1e5acea3b912c4862312d1
extra : amend_source : 510b3a9c5f5f6761420e67ccf17d5da01eff9faf
2016-04-18 14:24:05 +02:00
Ting-Yu Lin
2d3ac9ab7f Bug 1262755 - Enlarge caret touch target by 59% for Fennec. r=capella,snorp
Enlarge the touch target of the caret to the left, bottom, and right by
59% (13px) per bug 1262755 comment 7.

Since the touch target becomes larger, the carets on the <input> in
previous test might cause the next test to fail on <textarea> because it
will press on the caret when trying to focus on <textarea>. Add two <br>
to testAccessibleCarets.html to separate the <input> and <textarea>.

MozReview-Commit-ID: JIwmuHJ2QsQ

--HG--
extra : rebase_source : 73b662980a5be55a4e3e31506437f2c26f65cd85
2016-04-15 17:10:02 +08:00
Wes Kocher
e80ed17c41 Merge m-c to inbound, a=merge
MozReview-Commit-ID: 5AQXGbI0ke2
2016-04-21 15:02:19 -07:00
Randall Barker
984ceeb9cf Bug 1264666 - Remove nightly flags for native text selection handles r=snorp 2016-04-21 11:15:08 -07:00
Randall Barker
14ff3eae1d Bug 1265418 - Remove Nightly ifdefs for APZ r=snorp 2016-04-21 11:15:08 -07:00
Eugen Sawin
17fe5573bf Bug 1243431 - [4.1] Show permission request doorhanger on vibration request. r=margaret 2016-05-09 14:38:22 +02:00
Eugen Sawin
1cb3a78441 Bug 1243431 - [3.6] Add strings for Vibration API permission request doorhanger. r=margaret 2016-05-09 14:38:22 +02:00
Michael Kaply
02282f24eb Bug 1265742 - Update Google search plugin; r=margaret
--HG--
rename : mobile/locales/en-US/searchplugins/google.xml => mobile/locales/en-US/searchplugins/google-nocodes.xml
2016-04-19 15:57:50 -05:00
Margaret Leibovic
6187e90d7c Bug 1259186 - Send DOM event when feedback page is automatically loaded, instead of custom URL params. r=grisha
MozReview-Commit-ID: 6swre6VYpdz

--HG--
extra : rebase_source : fb308af493f88e588618fb63f964f242ac2f0b03
2016-03-23 16:03:42 -04:00
Rutuja
6b35519b8f Bug 1115006 - Use Downloads.getSystemDownloadsDirectory to get download directory for about:memory on Fennec. r=mconley,margaret
MozReview-Commit-ID: JBod1Ltcz0w

--HG--
extra : rebase_source : 3fdf3b1160f36b77c10641cab4e056c2a77dc151
2016-04-19 10:39:12 -04:00
Sebastian Kaspari
fa0ac6acc2 Bug 1265351 - HomeScreenPrompt: Save rejection and send telemetry only once. r=margaret
Additionally this patch:
* unifies the telemetry for declining the prompt to always be: (cancel,back,'home_screen_promotion')
* moves saving the rejection in the database to a background thread

MozReview-Commit-ID: HywutUDtGcY

--HG--
extra : rebase_source : 107b398a84a2eed231bcf86f5075b997bf98e5ff
2016-04-18 14:38:06 +02:00
Andrzej Hunt
0879705388 Bug 1246243 - Use book icon for reading list folder r=liuche
This approach is extensible and would allow easy addition of special icons for e.g. the
screenshots folder.

MozReview-Commit-ID: 44yWq85x2HG

--HG--
extra : rebase_source : be15df11f474f4db5546b823ca4040bdb2a63b6f
extra : amend_source : be16d760fa2c32cce3af7b2985d3549f9993664b
2016-04-12 14:47:24 -07:00
Alastor Wu
b5361feb4b Bug 1249579 - part2 : audio competing suspend/resume methods. r=snorp, baku.
MozReview-Commit-ID: EjNvKELCiAy

--HG--
extra : transplant_source : %AE%20%21e%E1%94%DE%29B%9C%F5%04%13%C6%3Dr%D3%9Aj%B4
2016-04-18 18:48:41 +08:00
Alastor Wu
0d34b81b5a Bug 1249579 - part1 : request audio focus on Fennec. r=snorp.
MozReview-Commit-ID: 45qW0Wjmnad

--HG--
extra : transplant_source : %C0%D5%AE%95m%89cW%E9%F6oK%0F%BBm%8E%BD%C2%2A9
2016-04-18 18:48:19 +08:00
Tristan Martin
d753291b70 Bug 1178722 - Further fix for 1178722 that supports HIDDEN attributes and includes testing and tidying. r=Margaret
--HG--
extra : rebase_source : 076811b9b468f48cee3ffcf7fad45135134435b0
2016-04-14 14:57:00 +02:00
Gijs Kruitbosch
30a0ac0ed8 Bug 1253673, r=bz
MozReview-Commit-ID: eyZ0XvZkfM

--HG--
rename : browser/base/content/test/general/dummy_page.html => dom/tests/browser/dummy.html
extra : amend_source : 0ceb77aae62ed163362e794b9aed8f92849e3e6d
extra : histedit_source : 60dbd015a6909a0023dc26613530c89a16de6ea7%2Ca5ea96457b370e57e3a73c19bea08e157f16ac4f
2016-04-19 09:56:19 +01:00
Wes Kocher
c4afaf3404 Merge fx-team to central, a=merge
MozReview-Commit-ID: 2arsWT5oaqp
2016-04-18 15:13:18 -07:00
Jan Henning
0e70bbab51 Bug 1265011 - Add test for hardware menu key support (Bug 1229967). r=sebastian
Make sure that the app menu can be opened and closed via the hardware menu key.

MozReview-Commit-ID: 3E459eCRneY

--HG--
extra : transplant_source : %81%BB%C1%EB2%9A%2C%FDG%F4vwMw%19%D4%C6%EF%7C%F5
2016-04-15 17:46:07 +02:00
Ray Lin
4395f4febb Bug 1198935 - Set about: pages header height to 48px. r=margaret
MozReview-Commit-ID: 6KfJytmDU93

--HG--
extra : transplant_source : %1A%FF%9A%7E%80h%FBE.%D9%BF0%BDg%13X%0D%B7%F8%E2
2016-04-14 15:23:12 +08:00
Carsten "Tomcat" Book
513366a363 Merge mozilla-central to fx-team 2016-04-18 15:08:55 +02:00
Carsten "Tomcat" Book
3689b59fae merge mozilla-inbound to mozilla-central a=merge 2016-04-18 14:39:45 +02:00
Wes Kocher
115c5a357a Merge m-c to inbound, a=merge
MozReview-Commit-ID: 2zwhun4JqPs
2016-04-15 15:39:25 -07:00
Wes Kocher
4f233d527d Merge fx-team to central, a=merge
MozReview-Commit-ID: J70qG3TcPFl
2016-04-15 15:36:39 -07:00
Jonas Sicking
9c521f30da Bug 1264706: Move nsILocalCertService, and implementation, to security/manager/ssl in order to alloow use w use elsewhere in gecko. r=dkeeler
--HG--
rename : devtools/shared/security/LocalCertService.cpp => security/manager/ssl/LocalCertService.cpp
rename : devtools/shared/security/LocalCertService.h => security/manager/ssl/LocalCertService.h
rename : devtools/shared/security/nsILocalCertService.idl => security/manager/ssl/nsILocalCertService.idl
rename : devtools/shared/security/tests/unit/test_cert.js => security/manager/ssl/tests/unit/test_local_cert.js
2016-04-15 14:52:13 -07:00
Andrzej Hunt
b3549fb619 Bug 1264138 - Upgrade FxAccountStatusActivity to use AppCompatActivity too r=sebastian
Our theming inheritance around Preferences still seems quite messy, however given we'll
need to uplift this I'm planning to tackle this in a separate bug.

We add the LocaleAwareAppCompatActivity in order to avoid affecting other consumers
of LocaleAwareFragementActivity (primarily the SearchActivity). We will investigate
those separately.

MozReview-Commit-ID: KVEZbDdza1s

--HG--
extra : amend_source : 3b296714b2f1d1aa2fd09f4ea8ee7641d0bb36fb
2016-04-14 08:35:13 -07:00
Carsten "Tomcat" Book
2b4e065b02 Merge mozilla-central to fx-team 2016-04-15 14:01:06 +02:00
Carsten "Tomcat" Book
c4445ccd33 merge mozilla-inbound to mozilla-central a=merge 2016-04-15 11:41:41 +02:00
Sebastian Kaspari
d31840b1fa Bug 1262098 - Use shorter string for "Add as search engine" to avoid UI bug. r=grisha
MozReview-Commit-ID: 3G4sk0H0aKM

--HG--
extra : rebase_source : 5f2a3bb5a1ec7bd9fda422abc2efab15134d5e20
2016-04-13 14:41:50 +02:00
Sebastian Kaspari
e518bddf29 Bug 1264243 - Prevent "Add to home screen" button from overlaying page icon. r=ahunt
MozReview-Commit-ID: JPK1y5B1HbD

--HG--
extra : rebase_source : 1f2b0352351e098f379c1b072f76f9ecb40c4d31
2016-04-13 12:59:51 +02:00
Sebastian Kaspari
ed73a5f51e Bug 1260451 - AndroidManifest: Handle configuration changes for smallestScreenSize and screenLayout. r=snorp
MozReview-Commit-ID: 1X4sQDotnSG

--HG--
extra : rebase_source : ae81282350b4f8a00c50efc27d3fafe4386786e8
2016-04-14 10:26:36 +02:00
Jorick Caberio
0da17b30e1 Bug 1261040 - Remove code code guarded by AppConstants.Versions.preICS. r=sebastian
MozReview-Commit-ID: Jmwl6sfEdx0

--HG--
extra : rebase_source : 84cb774e4a2414db9f921141c253b2ec93c4e8ee
2016-04-07 17:17:21 +08:00
Sebastian Kaspari
29eeec29d0 Bug 1264869 - Request STORAGE permission before downloading images. r=liuche
MozReview-Commit-ID: KJGugrRw5iI

--HG--
extra : rebase_source : d1314e42071aeabc9fedd6c8f94a61eb9a271345
2016-04-15 10:22:22 +02:00
Nick Alexander
fba2aa9c7b Bug 1261995 - Quiet infer NullPointerException warnings. r=mcomella
MozReview-Commit-ID: C0LPj4kGbPk

--HG--
extra : rebase_source : b22a0264605eb1e82d22cb751fcbd2f37c1478ce
extra : source : 6f36a3110086453834ec269f83887b2ad5d8d846
extra : histedit_source : e143a318bd45f27b43275bdc50d1d06d88dc74a8
2016-04-05 16:32:01 -07:00
Michael Comella
d64987abc0 Bug 1262625 - Only call getDir to initialize profile. r=jchen
MozReview-Commit-ID: F8ky8G9QhUT

--HG--
extra : rebase_source : 4478ae1ecb0b72915af5bd4df6118beefb78f76f
2016-04-13 16:12:14 -07:00
Michael Comella
343dabcba8 Bug 1238785 - Start file cleanup in onStart. r=ahunt
I added some log statements to ensure this worked correctly locally - on a new
profile:
  * Log statements were printed listed the two files I expected to be deleted
and their paths
  * The log statements did not appear after closing and reopened fennec,
meaning the process short-circuited as expected.

Ideally, I'd test that a profile that currently has these files actually gets
them deleted, but it's not easy to create profiles.

The previous patches also contributed unit tests.

MozReview-Commit-ID: 1FOZraATc6x

--HG--
extra : rebase_source : f6481569ce478b64571997c7ec44ad59ea0f9d93
2016-04-12 16:59:50 -07:00
Michael Comella
1c8d441139 Bug 1238785 - Add FileCleanupController and tests. r=ahunt
This controller is under-featured (e.g. it's not scheduling cleanups for future
dates and it doesn't cache files it already deleted) in favor of simplicity.

MozReview-Commit-ID: KJqKV0OH2ID

--HG--
extra : rebase_source : 370794e6a2ef93e11d28cc1b2d835027ba382516
2016-04-14 12:54:24 -07:00
Michael Comella
a6fa8606b3 Bug 1238785 - Add FileCleanupService. r=ahunt
This is intentionally kept minimal to ensure simplicity.

MozReview-Commit-ID: IJRxrTbWN2P

--HG--
extra : rebase_source : 13f9b1ef67eaa83bed64c28e1315b15e56a55a46
2016-04-12 17:10:35 -07:00
Margaret Leibovic
e5a1c49a20 Bug 1262032 - Update description subtitle for Settings groups. r=sebastian
MozReview-Commit-ID: H25j4HKiMDC

--HG--
extra : rebase_source : 6ad665ee52cc8128b8cd31298ff943976e97474a
2016-04-14 14:49:48 -04:00
Margaret Leibovic
e34bd976e9 Bug 1210386 - Link "Make Firefox Default Browser" to Settings page. r=sebastian
MozReview-Commit-ID: 9nrVnUaqO7K

--HG--
extra : rebase_source : 0eba2c2f543ed190c2c6d87252ef227f60dc6d87
2016-04-07 13:00:55 -04:00
Michael Comella
172b0b3053 Bug 1247489 - Add tests for mandatory field validation in TelemetryPingBuilder. r=grisha
MozReview-Commit-ID: 9AtwJ3SisFT

--HG--
extra : rebase_source : 63c4c7ba2bc5678f058aafdd718a7b583c7fb13b
2016-04-11 18:35:20 -07:00
Michael Comella
fa00135f56 Bug 1247489 - Move Telemetry*Ping* to telemetry/pings pkg. r=grisha
This should help make the Builders more discoverable when looking at the
TelemetryPing class.

MozReview-Commit-ID: K1OiSuKW5fO

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingBuilder.java => mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryCorePingBuilder.java
rename : mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPing.java => mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPing.java
rename : mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPingBuilder.java => mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPingBuilder.java
extra : rebase_source : 0e9165b9230f4cc91066460cc72d12f36efe9a91
2016-04-14 11:50:57 -07:00
Michael Comella
4a899f9e1f Bug 1247489 - Replace TelemetryPingGenerator with TelemetryPingBuilder & friends. r=grisha
The Builder pattern has the following benefits:
  * Encapsulate identifying optional arguments
  * Encapsulate parameter validation
  * More fluent parameter insertion (e.g. instead as unnamed arguments to a
function)
  * My implementation makes it fairly straight-forward to construct new
telemetry pings.

MozReview-Commit-ID: EpcW3N57HJj

--HG--
extra : rebase_source : a33ef584ed47b36910417854208fa02438556467
2016-04-11 17:45:29 -07:00
Sebastian Kaspari
bc7c3c706a Bug 1262105 - Add link to SUMO article to content notifications preference. r=grisha
MozReview-Commit-ID: 3xDGpUnJw3I

--HG--
extra : rebase_source : 874cb2852df7efbfa33b83255c1aaea079f01ff9
extra : amend_source : f2e4c8454bf87ec7cca912c6fefb3ca2ff24f906
2016-04-05 14:09:25 +02:00
Jan Henning
da383eac05 Bug 1263647 - When receiving a TabPreZombify event, send out a Tab:AudioPlayingChange message only if the tab is actually playing some audio. r=margaret
MozReview-Commit-ID: 7eAc2mNgM42
2016-04-14 16:18:00 -07:00
Chenxia Liu
4451ad321e Bug 1264136 - NPE in TabMenuStripLayout:onPageSelected while closing last tab or opening new tab. r=sebastian
MozReview-Commit-ID: 59gB7bGi6oh

--HG--
extra : rebase_source : 52bd81ad7e8be03f889ca6bbbbbc024ed33c7d26
extra : amend_source : c507dec27ade57ba9d910b5a06d19e461a3deda6
2016-04-13 11:29:15 -07:00
Andrzej Hunt
cdf0ada401 Bug 1263800 - Ensure bookmark star is enabled if tab data available r=grisha
If tab data is initially null then we disable the bookmark star. We need to explicitly
reenable it when we load an actual page. All other menu items seem to be explicitly
enabled as needed below, only bookmarks was omitted (since it's expected to be enabled
~all the time) - but we still could have disabled it previously.

MozReview-Commit-ID: GpVJu4Rw2dN

--HG--
extra : rebase_source : 6f4428e4273efe8f5639c36a1cfea9c7de6db135
extra : amend_source : c9f3c560f24bd878914ffd78829d3354349319a3
2016-04-14 11:13:52 -07:00
Wes Kocher
c7c7473c06 Merge m-c to fx-team, a=merge
MozReview-Commit-ID: 7Kut3ctlo0F
2016-04-15 15:40:17 -07:00
Andrzej Hunt
e0fb00ef3f Bug 1265087 - Migrated reading list panel should have white background r=liuche
Our other home-panels have a white background. This panel was created as a copy
of one of the onboarding screens, which have a grey-ish background, and that
attribute wasn't removed.

MozReview-Commit-ID: 2tN5ySUlxex

--HG--
extra : amend_source : 18514684b3ad0e10e6e1aaaade4bc8435166c6d8
2016-04-15 14:16:57 -07:00
Andrzej Hunt
8a5b550d44 Bug 1246712 - distinguish reader view pages when bookmarking r=margaret
MozReview-Commit-ID: 8g80ElZf0rU

--HG--
extra : rebase_source : 4efb749e4ca2955dd6f8b996809db49ea6a76cf7
2016-04-11 16:23:33 -07:00
Andrzej Hunt
e2de073003 Bug 1246239 - Show "saved offline" snackbar when readermode page is bookmarked r=sebastian
MozReview-Commit-ID: IC33HwSClcI

--HG--
extra : rebase_source : 673e2632a433366fb1c3fd18eeba0080399fd6b6
2016-04-12 16:18:50 -07:00
Michael Comella
67a2976dc3 Bug 1260478 - Fixed review nits from previous commits. r=me
Taking over this bug as nalexander is not available.

MozReview-Commit-ID: 2Vkv4U6anyD

--HG--
extra : rebase_source : 1f75a3057f8f2d9559577a2628ce6df86108fc05
extra : histedit_source : 580ec2f6de51b7872f1b400d3cb0f4a37c2600ec
2016-04-14 14:38:43 -07:00
Nick Alexander
3c86f5a00e Bug 1260478 - Post: Remove TabsProvider integration tests moved into unit tests. r=mcomella
None of these were run in automation anyway.  I elected to hg rm,
rather than try to hg mv, since I reworked the tests a little for
Robolectric, including merging two into one.  The history isn't
particularly valuable here.

MozReview-Commit-ID: 47eDYvS3l1y

--HG--
extra : rebase_source : 67594b884b62081475deb7691b47b7862950a99f
extra : histedit_source : 59020ff5f6b983868143ee317dc3ce745e8f77f9
2016-03-29 10:19:58 -07:00
Nick Alexander
5db5e02917 Bug 1260478 - Part 3: Duplicate TestRemoteTabs integration test into unit tests. r=mcomella
MozReview-Commit-ID: BLVX8CUJDje

--HG--
extra : rebase_source : 1dd52543cbdba0ecf3ac1b5b05d0f4b6d5da1e60
extra : histedit_source : 0152ed5ef204ca9196168a04914b4e015d093fe2
2016-03-27 16:30:19 -07:00
Nick Alexander
bdec48be3f Bug 1260478 - Part 2: Duplicate TestTabsRecord into TestTabsProvider unit test. r=mcomella
MozReview-Commit-ID: 4V8Pfll5MfN

--HG--
extra : rebase_source : 9beb3573974f5045b79f643174457a04b228c5da
extra : histedit_source : b4f1b5e21aecd24aaf0379e121303eebdbde6d08
2016-03-27 14:24:22 -07:00
Nick Alexander
f14934994f Bug 1260478 - Part 1: Duplicate TestFennecTabsStorage integration test into TestTabsProvider unit test. r=mcomella
Notes:

* Setting the package name in robolectric.properties lets us read
  resources.  If we don't, Robolectric tries to read from
  org.mozilla.fennec_$USER or similar.

* We need DelegatingTestContentProvider not for isolation but to
  append "test=1" to all URIs.  Robolectric provides isolation by
  starting each test in a clean environment, but if we don't tell the
  CP to run in test mode, it tries to write into DBs that Robolectric
  doesn't like.

* Robolectric needs manual "shimming", i.e. the test must tell the
  ShadowContentResolver how to resolve.  We also need to handle
  shutdown() ourselves.  Basically, Robolectric doesn't try to
  duplicate the entire Android ContentProvider lifecycle.

* We might grow a "ContentProviderTest" base class to handle the
  registration and shutdown in the future.  I find such base classes
  frustrating and limiting in our Robocop tests, so I'd like to try to
  avoid them in our unit tests for as long as possible.

MozReview-Commit-ID: A0paQXA2uoy

--HG--
extra : rebase_source : 85867a460cd076bb5e77a6e40b2d8bcb7fe45f67
extra : histedit_source : e2c6e56193c96fcf42e848d636328e03c405c7dd
2016-03-27 14:20:41 -07:00
Carsten "Tomcat" Book
0a47ef22ae Merge mozilla-central to fx-team 2016-04-14 11:39:50 +02:00
Carsten "Tomcat" Book
32c25ca2da merge mozilla-inbound to mozilla-central a=merge 2016-04-14 11:38:11 +02:00
Michael Kaply
b4f3501464 Bug 1264076 - Remove accidental commit of bouncer change; r=me 2016-04-13 20:51:40 -05:00
Michael Kaply
e9bc8bf7d5 Bug 1264076 - Allow customized device string for user agent on Fennec; r=mcmanus 2016-04-13 20:46:13 -05:00
Chenxia Liu
96c3aca20a Bug 1264262 - crash in java.lang.IllegalArgumentException: Missing default panels at org.mozilla.gecko.home.HomeConfigPrefsBackend.combineHistoryAndSyncPanels(HomeConfigPrefsBackend.java). r=mcomella
MozReview-Commit-ID: F9Sg6l6yMlw

--HG--
extra : rebase_source : 99d7217ee84b47b361c012d4a0ed423207f46edc
2016-04-13 18:38:02 -07:00
Andrzej Hunt
7783783cc8 Bug 1264134 - Don't assert SavedReaderViewHelper running off main thread r=mcomella
It turns out that with sync enabled, we do the first load of the database on the UI thread.
The SavedReaderViewHelper (which is initialised during DB load) assumes we're run off the
main thread, we need to disable that assertion until we can ensure that DB loading is done
off the main thread.

MozReview-Commit-ID: AYQewTVjEbA

--HG--
extra : amend_source : 7d479084124b57135f4a97687d43652cf8041960
2016-04-12 18:55:25 -07:00
Michael Comella
0d07c41e3e Bug 1260758 - Bump core ping version for distribution id. r=trivial
MozReview-Commit-ID: 2MfuzuTTimI
2016-04-13 16:23:55 -07:00
Michael Comella
3b46934fc2 Bug 1255657 - Write client ID file before Gecko starts to prevent race. r=rnewman
As best as I can tell, this code runs before Gecko is initialized. via
bug 1255657 comment 8:

To confirm this, GeckoProfile is created before the GeckoThread is
finished launching but it seems almost coincidental:
 GeckoApp.onCreate
  GeckoThread.launch
   GeckoThread.start
...
 GeckoThread.run
  GeckoThread.getGeckoArgs (notably before GeckoLader.nativeRun)
   GeckoThread.addCustomProfileArg
    (if GAP.getGeckoInterface != null, which is set earlier in GeckoApp.onCreate)
     EITHER
     GeckoProfile.getDir() (if in guest mode)
      GeckoProfile.forceCreate
     GeckoProfile.forceCreate (if not in guest mode)

forceCreate opens the times.json file.

That being said, if this code path changes, forceCreate is also called
when the GeckoView is initialized (which occurs after the GeckoThread.launch
call, but is likely to happen before Gecko finishes launching).
---

If we wanted GeckoProfile initialization timing to be seem less coincidental,
we should consider initializing the profile non-lazily: bug 1262625.

MozReview-Commit-ID: LGluC021CTg

--HG--
extra : rebase_source : 7d1ff8a354accfaae0dc3f2d222ed32f6aa8cbf6
2016-04-06 15:07:01 -07:00
Michael Comella
b24d5576d8 Bug 1260758 - Add distribution field to Fennec core ping - forgot to add file; r=mfinkle,mkaply 2016-04-13 15:31:36 -05:00
Michael Comella
05e644fb67 Bug 1260758 - Add distribution field to Fennec core ping; r=mfinkle,mkaply 2016-04-13 15:17:13 -05:00
Michael Comella
2f85846508 Bug 1258789 - Remove allowEmptyLoops I added previously to simplify things. r=grisha
MozReview-Commit-ID: 7iL8VjkMSTh

--HG--
extra : rebase_source : 2677a416fabf5672d3fc259ed85424a1b2e96b6f
2016-04-13 11:22:41 -07:00
Michael Comella
26ea5a1f85 Bug 1258789 - Remove WhitespaceAround tokens filter and fix lcurly issues. r=grisha
Some issues remain.

MozReview-Commit-ID: 3vWQ3z5mnba

--HG--
extra : rebase_source : caacb08f22c88048f9f845a8c5a76a8d57a6e340
2016-04-13 11:17:55 -07:00
Michael Comella
f28c02b827 Bug 1258789 - Add div* token for WhitespaceAround. r=grisha
Fix some cast issues while I was at it.

MozReview-Commit-ID: 53ANWpnIGwk

--HG--
extra : rebase_source : 57c8e8c764f5f8fc4f0eb3e2880d741904f34a0d
2016-04-13 11:15:00 -07:00
Michael Comella
e2389005e3 Bug 1258789 - Fix remaining rcurly issues by eliminating double curly bracket. r=grisha
It's an anti-pattern:
  https://blog.jooq.org/2014/12/08/dont-be-clever-the-double-curly-braces-anti-pattern/

Mobile-relevant summary:
  * It creates new types, bloating our APK
  * It can cause memory leaks by keeping a reference to the containing class

MozReview-Commit-ID: 4HQHgenOq92

--HG--
extra : rebase_source : da676dcd95f836b6ef3ba4d8465ecaf74d1e15e8
2016-04-13 11:03:40 -07:00
Michael Comella
746406d02b Bug 1258789 - Add rcurly and fix {} issues. r=grisha
MozReview-Commit-ID: m2dF4mPC1u

--HG--
extra : rebase_source : 6797dc55ab478d310f43a77badc83eabcedd0d6d
2016-04-13 10:51:26 -07:00
Michael Comella
b110b39473 Bug 1258789 - Add passing tokens to WhitespaceAround. r=grisha
MozReview-Commit-ID: ANbUHFNzE7W

--HG--
extra : rebase_source : 17d1c516fc4a52622615f82a930cddfbfe680435
2016-04-12 18:44:18 -07:00
Michael Comella
3f8a975e44 Bug 1258789 - Add plus operator to WhitespaceAround and fix. r=grisha
MozReview-Commit-ID: 419NkkMHWCG

--HG--
extra : rebase_source : da4ccbacf82ac546cbcd79f0ad26a26f0305f230
2016-04-12 18:42:40 -07:00
Michael Comella
70af5a5d77 Bug 1258789 - Add star to WhitespaceAround and fix. r=grisha
MozReview-Commit-ID: 3FY8m1qPj8V

--HG--
extra : rebase_source : 52395f96af35872f3f06edcedd7f3bbef44eab82
2016-04-12 18:36:28 -07:00
Michael Comella
82a1b5f82d Bug 1258789 - Add shift operators to WhitespaceAround & fix. r=grisha
MozReview-Commit-ID: 9sCtvvUYixh

--HG--
extra : rebase_source : 4cfb3d835d2fc17471c227f6f9c9ed8699b2ec85
2016-04-12 18:29:58 -07:00
Michael Comella
0d235c902a Bug 1258789 - Add a few more to WhitespaceAround and fix. r=grisha
MozReview-Commit-ID: AkJEXhlp3Rf

--HG--
extra : rebase_source : 1bda7fa0a606feff4adfc565524e125b3dbe8312
2016-04-12 18:27:20 -07:00
Michael Comella
91cab209eb Bug 1258789 - Add while to WhitespaceAround. r=grisha
MozReview-Commit-ID: HhbBCjojNiC

--HG--
extra : rebase_source : 27e7eab179cf26fbf877f15d7d4dc70ffb3a9725
2016-04-12 18:21:45 -07:00
Michael Comella
536223b0e1 Bug 1258789 - Add synchronized & non-failing try to WhitespaceAround. r=grisha
MozReview-Commit-ID: EBnxF8j2eeY

--HG--
extra : rebase_source : e5f79e706f7ba63b484baf5b339581cdbeee626d
2016-04-12 18:20:51 -07:00
Michael Comella
b7ca9be873 Bug 1258789 - Add switch for whitespaceAround. r=grisha
MozReview-Commit-ID: 167JoSl5go5

--HG--
extra : rebase_source : 551818e264794e34c4701ee53953489fc5554b4b
2016-04-12 18:19:14 -07:00
Michael Comella
ee32f11bed Bug 1258789 - Add if & return for WhitespaceAround. r=grisha
MozReview-Commit-ID: HcWrFHy2CeP

--HG--
extra : rebase_source : c687476ab0ee6fb1054e507cb50495e55e856725
2016-04-12 18:18:02 -07:00
Michael Comella
df95be9bdf Bug 1258789 - Add literal catch & a few others that don't break for WhitespaceAround. r=grisha
MozReview-Commit-ID: 1En0xuxT4md

--HG--
extra : rebase_source : e387c2bce427e33185c4dabdec7b169ef5133de8
2016-04-12 18:16:16 -07:00
Michael Comella
6ea08620c8 Bug 1258789 - Add binary logic operators for WhitespaceAround. r=grisha
MozReview-Commit-ID: 12BUCUmassJ

--HG--
extra : rebase_source : c414f36187da86390b633357232c883668f9afe1
2016-04-12 18:10:55 -07:00
Michael Comella
30fdaa2a6c Bug 1258789 - Add WhitespaceAround for ASSIGN token. r=grisha
MozReview-Commit-ID: 6IOIatuHuYW

--HG--
extra : rebase_source : af95f21ba76cf1ceb4f935d1d9947c9f2a9187f2
2016-04-12 18:07:33 -07:00
Mark Capella
88cc5b6c9a Bug 1235508 - Re-implement fast Phone number selection on long-press, r=TYLin 2016-04-14 02:14:16 -04:00
William Chen
7123f415a0 Bug 1260499 - Handle incoming messages before push service is initialized. r=nalexander,jchen
--HG--
extra : rebase_source : b36be1078f2952aab5cc95e4a9c2a44e85f7876b
2016-04-13 16:55:25 -07:00
William Chen
3b5039d9a7 Backed out changeset 6ccfb75c8926 (bug 1260499) for wrong patch
--HG--
extra : rebase_source : 2915ef7ca91bafc94532fb38a179cc49e9d4e9a0
2016-04-13 15:37:48 -07:00
Wes Kocher
aa13902dde Merge m-c to inbound, a=merge
MozReview-Commit-ID: ET0qKXDqQXD
2016-04-13 14:45:41 -07:00
William Chen
01a139d9a0 Bug 1260499 - Handle incoming messages before push service is initialized. r=nalexander,jchen
--HG--
extra : rebase_source : 8f6682b61d77c4c943914b23f2eb5ba1c014a576
2016-04-13 14:30:33 -07:00
Margaret Leibovic
549c799b69 Bug 1261137 - Add groups in Settings > Advanced. r=sebastian
MozReview-Commit-ID: 2jUL0PJ33bq

--HG--
extra : rebase_source : b715458d0ab6dd137e42467f98ed6a94ffa719c1
2016-04-12 17:52:47 -04:00
Margaret Leibovic
bc99856818 Bug 1262489 - Improve wording of "Show web fonts" setting. r=sebastian
MozReview-Commit-ID: CNcOsT0Zusm

--HG--
extra : rebase_source : 3e3a57468d3cc0d26ce43400cc333bd2eedf3123
2016-04-12 17:41:01 -04:00
Jorick Caberio
37e0f76dd7 Bug 1261039 - Remove Honeycomb code guarded by AppConstants.Versions.preHCMR1 / preHCMR2. r=sebastian
MozReview-Commit-ID: LdULUXl2kba

--HG--
extra : rebase_source : 6c5b06298592b30dacf3f10de14d180e04d18e38
2016-04-08 16:52:57 +08:00
Mouaad Aallam
0ba922c58c Bug 1261044 - Move AnimatorProxy functionality into ViewHelper. r=sebastian
MozReview-Commit-ID: IjVVUfJheOt

--HG--
extra : rebase_source : 246ab0a831fe70bab532981a0b42e9d389d87c47
2016-04-13 15:50:35 +02:00
bzrd_Sdn
936e313c2f Bug 1256922 - Remove unused HardwareUtils.isLowMemoryPlatform(). r=sebastian
MozReview-Commit-ID: CDkh8AekOVe

--HG--
extra : rebase_source : 232f50d3b6fb8d4599967552679f05fe070e5dc1
2016-04-13 14:49:24 +02:00
Michael Kaply
5f529ba85b Bug 1264050 - Use distribution/defaults directory even if is no SIM card data; r=sebastian 2016-04-13 08:47:07 -05:00
Jan Henning
7ccbb26669 Bug 1229967 - Handle onKeyDown() for the menu key in GeckoMenu. r=sebastian
This restores the functionality to close the menu by pressing the hardware menu key.

MozReview-Commit-ID: EKCeALPvFoB

--HG--
extra : transplant_source : %02%7E%E0%98%40%F3%D1%A4C%FC%CA%7E%CB%96%A2%CC%EDkq%D6
2016-04-11 12:42:21 +02:00
Mark Capella
9362beb939 Bug 1263460 - Fix UI on Long press of empty Yahoo search field, r=sebastian
MozReview-Commit-ID: IKXthXUihOL
2016-04-12 21:42:17 -04:00
Andrzej Hunt
fed518b421 Bug 1257636 - Show "bookmarks panel is hidden" snackbar if necessary in migrated reading list panel r=liuche
MozReview-Commit-ID: BVbILiWMyfT

--HG--
extra : rebase_source : bd4a611f91a78b617cfb310b57da548ec15ca52a
2016-04-11 12:48:19 -07:00
Wes Kocher
a3d9ff8cce Merge m-c to fx-team, a=merge
MozReview-Commit-ID: BtBb2JBX4uX
2016-04-12 15:37:01 -07:00
Wes Kocher
1e0c62f10f Merge fx-team to central, a=merge
MozReview-Commit-ID: ApMCFiyBik0
2016-04-12 15:34:39 -07:00
Sebastian Kaspari
6aaf1be80e Bug 1258988 - Content notifications: Add support for Tumblr. r=mcomella
MozReview-Commit-ID: JT2MtkvQtKx

--HG--
extra : rebase_source : bb0ba96a873980b47eb567df3d6f9af8f644cbd1
extra : amend_source : 3c98ded83c9d7ef258d16976382a0c3f17153fc5
2016-04-12 16:20:32 +02:00
Sebastian Kaspari
c72ce17279 Bug 1232706 - Promote "Add to home screen" for frequently visited websites. r=margaret
MozReview-Commit-ID: 2OW7GKxuQmr

--HG--
extra : rebase_source : 5cbcfe4183a7bef66f30e4797d5362053eda22c4
2016-04-06 09:41:34 +02:00
Michael Comella
810b3337f8 Bug 1263470 - Set edit/display layouts to invisible to avoid animation jank. r=sebastian
They were previously being set to GONE, causing a measure pass when the
animation started.

MozReview-Commit-ID: FKjB2vJmWkd

--HG--
extra : rebase_source : 25a10f5e8121b48883d8673fa2184ab42a341605
2016-04-10 13:50:06 -07:00
Carsten "Tomcat" Book
bf1832d88a Merge mozilla-central to fx-team 2016-04-12 13:55:15 +02:00
Carsten "Tomcat" Book
128f40b9a8 merge mozilla-inbound to mozilla-central a=merge 2016-04-12 13:49:51 +02:00