Граф коммитов

21318 Коммитов

Автор SHA1 Сообщение Дата
Phil Ringnalda 400813c30b Merge m-i to m-c, a=merge 2016-09-30 23:24:52 -07:00
Gregory Szorc d0e135f5d1 Backed out changesets cc4bdd6afea0, abc52d4c5f87, and 25e1ca942799 (bug 1267884) for Android bustage
CLOSED TREE

--HG--
extra : amend_source : 1f0c7bbb5aa8a3dab38f0785e13e32f59e8f8c79
extra : histedit_source : ca99420cac7019a4b6fd6aab781b93151092a8bc%2C0ef091317a27688c734f20417875406726e35de7
2016-09-30 15:01:13 -07:00
Phil Ringnalda a5c0ab382f Bug 1278581 followup, placate checkstyle
CLOSED TREE

MozReview-Commit-ID: Apt89thqPfX

--HG--
extra : source : 548560e9e76273fa6df17415e9b29bfd0361e61b
extra : amend_source : c8022b27421c033809ce5b543f49c0af2ed91020
extra : histedit_source : 22ec0210605b62ef3990e6ee9007d1816cd2a722
2016-09-30 08:21:55 -07:00
Dylan Roeh cd9b07a37b Bug 1306497 - Check that the GeckoInterface and instance EventDispatcher are non-null before dispatching events. r=jchen 2016-09-30 12:01:56 -05:00
Phil Ringnalda c0aa43cf5d Bug 1278581 followup, placate checkstyle 2016-09-30 08:21:55 -07:00
Eugen Sawin a0d9e7bbca Bug 1305461 - [2.2] Replace @JNITarget annotation with @Keep for native reference field. r=sebastian 2016-09-30 16:55:40 +02:00
Eugen Sawin 965c522297 Bug 1305461 - [1.2] Add Android support annotation JAR to mozglue and import Android ProGuard config for extended annotation support. r=sebastian 2016-09-30 16:55:40 +02:00
Kevin Lam 63e52fcef6 Bug 1219393 - Left aligned search icons only when there are less icons than required to fill the search icon bar. r=sebastian
MozReview-Commit-ID: JXBGJuT2bN0
2016-09-30 09:56:55 -04:00
Andrzej Hunt d25a94bfb6 Bug 1267884 - Add empty updateVisuals() to GeckoCustomTabsService to match customtabs-23.4 r=sebastian
MozReview-Commit-ID: FCDCqOLJDDt

--HG--
extra : rebase_source : 3f6cb469c10035bbbacba85413ee9ec95835076b
2016-09-30 09:18:10 -07:00
Andrzej Hunt 04780a2df0 Bug 1267884 - Upgrade support libraries to 23.4 r=sebastian
MozReview-Commit-ID: C7LWrLfYlQU

--HG--
extra : rebase_source : 164b33c147fd57c63e00c82738eaa9d3b21c6800
2016-09-30 09:16:23 -07:00
Andrzej Hunt 216129b6af Bug 1306104 - Disable LeakCanary for localOld builds to keep single-dex gradle builds under 65k methods r=nalexander,sebastian
MozReview-Commit-ID: KmMgaHC37cj

--HG--
extra : rebase_source : b1b0ba8a5fea3d22edd830379296dd4a292021ed
2016-09-28 13:43:29 -07:00
Andrzej Hunt 4696fefe72 Bug 1306140 - Add tests for HomeConfig migration r=sebastian
I am open to replacing "constellations" with a different name, but it was the best
I could come up with so far.

MozReview-Commit-ID: 9pljV8nC6O8

--HG--
extra : rebase_source : 781b5e1776adf457c92cacfecc09dc7afe03ad41
2016-09-29 11:36:57 -07:00
Andrzej Hunt 2472fb0d2a Bug 1306140 - Pre: make HomeConfig VERSION package-private to allow access for testing r=sebastian
MozReview-Commit-ID: LT5E22L009Y

--HG--
extra : rebase_source : 83e2488e6a76470caa3e0a25a9ba84c92df9254a
2016-09-30 10:14:01 -07:00
Andrzej Hunt 2ea24d1e1f Bug 1306140 - Pre: move HomeConfig migration loop into separate method to help with testing r=sebastian
MozReview-Commit-ID: 4CDdqXPAae0

--HG--
extra : rebase_source : 320044b7338c149d36b16311450d48fca5225309
2016-09-29 11:32:51 -07:00
Andrzej Hunt 08a55bdaad Bug 1304688 - Implement long-press timer to workaround broken onKeyLongPress on Android N r=sebastian
Note: we also change the return value of a long-press when the tab history fragment is showing:
we want to completely ignore long-presses in this case, previously we used to return false in this
case, which suggests that we didn't handle the event - however we explicitly consider this a no-op,
so should return a value reflecting that (in reality: no one else handles the long-press, so this
makes no effective difference).

MozReview-Commit-ID: FYrCVsNHfjv

--HG--
extra : rebase_source : d1af525a119264ea820b665198f45ff32898e8e1
2016-09-27 09:42:44 -07:00
Andrzej Hunt 26e91fdaeb Bug 1304688 - Pre: add Versions.preN to AppConstants r=sebastian
MozReview-Commit-ID: Awh9db04xW

--HG--
extra : rebase_source : c640ed3edcb16383548911c7ec0e5af5a523001c
2016-09-27 09:06:26 -07:00
dlim@mozilla.com 4fd116a405 Bug 730142 - Download batching. r=Grisha,rnewman
MozReview-Commit-ID: BhMmynysoKa

--HG--
extra : rebase_source : c62eb8bdd93bf38281aa13d37e6a49b271029e09
2016-09-30 09:33:08 -07:00
Carsten "Tomcat" Book 6636b09ddd merge mozilla-inbound to mozilla-central a=merge 2016-09-30 12:02:16 +02:00
Andrzej Hunt e6399718e5 Bug 1298783 - Pre: add notificationUri to highlights query r=Grisha
This ensures that a DB modification will trigger a refresh of any clients
using getHighlights().

MozReview-Commit-ID: Cauc89ryDHr

--HG--
extra : rebase_source : e70401ba51ea406ab339f02abec73ec9bf1b3332
2016-09-08 16:54:43 -07:00
Andrzej Hunt e3c528759c Bug 1298783 - Add activity stream blocklist tests r=Grisha
MozReview-Commit-ID: 3W51oPtdsxw

--HG--
extra : rebase_source : 0eb895068599d262f9706a94039214a16b5e1189
2016-09-27 12:32:22 -07:00
Andrzej Hunt c19ddbdfc3 Bug 1298783 - Implement expiry for activity stream blocklist r=Grisha
MozReview-Commit-ID: CfBIvX1ml05

--HG--
extra : rebase_source : 3ae36abf11a66607d1d7f71affda3e164f21cdac
2016-09-21 14:57:11 -07:00
Andrzej Hunt 00b1aee19e Bug 1298783 - Implement adding pages to highlights blocklist r=Grisha
MozReview-Commit-ID: 5dCLHx2UJ5

--HG--
extra : rebase_source : f4ed88a8133b677a4a2aff91790cb11ffb8bfc56
2016-09-21 12:12:06 -07:00
Andrzej Hunt d360e38495 Bug 1298783 - Exclude blocklist sites from highlights query r=Grisha
MozReview-Commit-ID: 9xBX9zZApfT

--HG--
extra : rebase_source : f569b373eed10abaf6dbdd990a64ca79213c3df2
2016-09-27 12:30:08 -07:00
Andrzej Hunt 30ca845852 Bug 1298783 - Add highlights blocklist table r=Grisha
MozReview-Commit-ID: 6Cng37HFCLO

--HG--
extra : rebase_source : d51cd40515abfff83bd6d68425af294d547e822a
2016-09-28 14:56:23 -07:00
Carsten "Tomcat" Book 5b45193594 merge mozilla-inbound to mozilla-central a=merge 2016-09-29 11:44:58 +02:00
Carsten "Tomcat" Book d282a3c477 merge fx-team to mozilla-central a=merge 2016-09-29 11:43:57 +02:00
Phil Ringnalda 5cf9c22a5e No bug, placate Android checkstyle test 2016-09-28 19:56:49 -07:00
Tuhina 047e64c6dc Bug 1270162 - Empty view flashes when navigating to history panel. r=JanH 2016-09-26 00:59:19 +05:30
Andrzej Hunt 4e3a9ee531 Bug 1306021 - Remove unneeded R.java copies to reduce field wastage r=nalexander
MozReview-Commit-ID: GHYCqzaMaGe

--HG--
extra : amend_source : bf65ed253bcc353c7fb77fa5029d85e862695491
2016-09-28 10:04:48 -07:00
Carsten "Tomcat" Book 572e74ee99 merge mozilla-inbound to mozilla-central a=merge 2016-09-28 15:56:33 +02:00
Dylan Roeh f2d63fa10f Bug 1294821 - De-singletonize EventDispatcher and make it application-specific. r=jchen 2016-09-27 11:07:24 -05:00
Cory Price 8ec7ee57a1 Bug 1302414 - Theme preview is not working. r=sebastian
--HG--
extra : rebase_source : 53c8b40b3666e30d53852ce8633c91e1eaf7c25e
2016-09-23 09:56:26 -07:00
Eugen Sawin 905a450ea2 Bug 1291424 - [1.4] Extract and cache libs on first run. r=glandium,snorp 2016-09-27 14:02:37 +02:00
Jim Chen dc65b25659 Bug 1305271 - 3. Use @JNITarget for Distribution.getDistributionDirectories; r=snorp
Distribution.getDistributionDirectories is currently annotated with
@WrapForJNI, but because it's used from JS through JNI.jsm, the
@JNITarget annotation is more appropriate.
2016-09-28 23:49:25 -04:00
Dylan Roeh 6e5193f571 Bug 1305086 - Move code from GeckoApp.onDestroy() to BrowserApp.onDestroy() so that finishing a CustomTabsActivity doesn't kill the process. r=snorp 2016-09-28 15:44:26 -05:00
Carsten "Tomcat" Book b5206d37f5 Merge mozilla-central to mozilla-inbound 2016-09-28 16:25:01 +02:00
Geoff Brown c07f3f97e3 Bug 1305715 - Remove unused robocop logging code; r=jmaher 2016-09-28 07:45:31 -06:00
Geoff Brown 0e6cb7d2ec Bug 1304681 - Do not clear robocop test name between tests; r=jmaher 2016-09-28 07:45:30 -06:00
Grigory Kruglov bd06fa760b Bug 1304914 - Don't show "offline version" notifications on error pages r=ahunt
MozReview-Commit-ID: BE6GPLCAU3h

--HG--
extra : rebase_source : 4fd79c95f202b6ed550968acdaf31dc9efae56e5
2016-09-26 13:53:52 -07:00
Dylan Roeh b9e7ae8f83 Bug 1303776 - Call closeTab on the active tab when finishing a CustomTabsActivity. r=snorp 2016-09-23 11:02:45 -05:00
James Willcox 23d3601666 Bug 1278581 - Show neterror page if you enter an unknown URI scheme into urlbar on Android r=sebastian 2016-09-29 08:27:54 -05:00
Grigory Kruglov 41727dee14 Bug 1305615 - Use correct database in tests, and close db connection in TestLegacyLoader r=ahunt
We need to ensure we can explicitely close any database connections we open in the TestLegacyLoader,
so we initialize a BrowserProvider instance so that we can then call .shutdown() on it once we're done,
which will close any open connections.

Additionally, we need to make sure to use correct authority when registering (using AUTHORITY_URI produces dual mapping
of providers, from content://org.fennec... and from org.fennec...), and wrap our providers in a DelegatingTestContentProvider,
which will append PARAM_IS_TEST param to wrapped URIs -  when present this ensure we won't try to load a per-profile database.

MozReview-Commit-ID: LnzPhGOe6OY

--HG--
extra : rebase_source : 76eaadaa78bed7918b90012f8bdcc996dc3b2024
2016-09-26 20:26:59 -07:00
Andrzej Hunt 00c5b84a39 Bug 1304777 - Part 2: Fix panel removal migration to not discard DEFAULT flag if set r=sebastian
If the replacement panel was DEFAULT, then the migration should retain the DEFAULT flag.
By trying to ensure visibility of the default panel, we accidentally discarded the DEFAULT flag.
This patch provides a minimal fix for not discarding the default flag. It might be better
to rearchitect the whole method, but a minimal solution is preferred for now since this requires
uplifting to beta.

MozReview-Commit-ID: EkbDD7pipgJ

--HG--
extra : rebase_source : 4d6981feefef988fe2a4cb9d3ec294d71896c2b3
2016-09-26 13:16:03 -07:00
Andrzej Hunt 52cd9d958f Bug 1304777 - Part 1: Perform homeconfig cleanup to ensure default still exists r=sebastian
Bug 1251362 can result in there no default panel being set (this happens if the history
panel was the default panel before the panel migration). We can reuse the code from a previous
bug which sets history as the default panel if no other panel is set as default.

A second commit fixes the broken migration to ensure that history remains the default
homepanel, however this cleanup migration will help ensure existing clients get fixed.

MozReview-Commit-ID: EcUb2uUfOeJ

--HG--
extra : rebase_source : 41a313d1c0c55900cd3a075128b1d861a155b52e
2016-09-26 13:12:16 -07:00
Sebastian Kaspari 8f6b9fd821 Bug 1303292 - Media notification: Use icons that have at least the target size. r=ahunt
MozReview-Commit-ID: 7pNfrFEtyUd

--HG--
extra : rebase_source : 9e5362c0e9d90f4eaa74afd3ef20d73cc72d76f3
2016-09-23 13:36:27 +02:00
Sebastian Kaspari 572ea64cb9 Bug 1289140 - LauncherActivity: Exclude from recents and filter flags. r=ahunt
MozReview-Commit-ID: 2brjUGbl7hx

--HG--
extra : rebase_source : 5f86031192d2a6815a103cc50ff6f3efc0cdf492
2016-09-09 10:13:14 +02:00
Iris Hsiao 767e1e9b11 merge mozilla-inbound to mozilla-central a=merge 2016-09-26 18:34:20 +08:00
Iris Hsiao a95e0164c0 merge fx-team to mozilla-central a=merge 2016-09-26 18:29:38 +08:00
Nick Alexander 1a1eb3493b Bug 1255875 - Complain to treeherder if Android checkstyle, lint, or unittest fails. r=grisha
It's not obvious how to listen to individual errors in most cases, so
we just link to the reports for now.  Progress!

MozReview-Commit-ID: 8nGRJdpzZnO

--HG--
extra : rebase_source : e81c9b29cb03c5ba73e793512525b5c9c68ab655
extra : amend_source : ce1e2368d43d37cab8fe41cd7a978342ad3e2ea6
2016-09-23 13:58:10 -07:00
Carsten "Tomcat" Book a65e4225ef merge mozilla-inbound to mozilla-central a=merge 2016-09-23 12:05:53 +02:00