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

20260 Коммитов

Автор SHA1 Сообщение Дата
Wes Kocher d378b20bf5 Merge m-c to inbound, a=merge CLOSED TREE 2016-05-16 14:22:37 -07:00
Andrzej Hunt a7f1ecfbf0 Bug 1272391 - Send Action instead of Cancel from SimpleHelperUI button r=sebastian
I didn't pay attention while copying telemetry events. We send cancel when dismissing
the prompt, action when the user selects the suggested prompt action.

MozReview-Commit-ID: IAOMRRemCiz

--HG--
extra : amend_source : 0a940fa3109009c85d81765cd4380cd7c227814d
2016-05-12 10:56:50 -07:00
Phil Ringnalda 2f5b16f2a4 Merge m-c to f-t 2016-05-14 14:56:41 -07:00
Phil Ringnalda 082cfb6b13 Bug 1271103 followup, placate checkstyle with a space, a=nnoyance 2016-05-14 14:54:59 -07:00
Mark Capella 3301837485 Bug 1262916 - Option to add custom search engine should disappear when site is added, r=margaret, florian 2016-05-14 16:43:51 -04:00
Phil Ringnalda 2be4cee4d3 Merge f-t to m-c, a=merge 2016-05-14 13:04:50 -07:00
Sebastian Kaspari 586d866e46 Bug 1272021 - FaviconView.updateImageInternal(): Exit early if bitmap is null. r=ahunt
MozReview-Commit-ID: 2ZtAMI1XMoC

--HG--
extra : rebase_source : 68f774bea297f45cbf5c0cdb70398227b26b4c27
2016-05-11 20:00:41 +02:00
Sebastian Kaspari c90925bcc2 Bug 1271698 - Add Switchboard flags for URL bar changes. r=margaret
* urlbar-show-origin-only: Only show origin in URL bar instead of full URL (Bug 1236431)
* urlbar-show-ev-cert-owner: Show name of organization (EV cert) instead of full URL in URL bar (Bug 1249594)

MozReview-Commit-ID: AxbrB1gsobh

--HG--
extra : rebase_source : 185088d363fdfe9ba395caa07f05b9c17201e19a
extra : amend_source : 7879f2f122892a1af93f29c9e64f1076ee20191e
2016-05-11 11:55:06 +02:00
Michael Comella e976d0a153 Bug 1272166 - Update UI telemetry logging. r=margaret
MozReview-Commit-ID: Gzb2qdm3TuT

--HG--
extra : rebase_source : 9f81f860bbae7b61245aae5a02131c8400a1035c
2016-05-11 17:30:34 -07:00
Kartikaya Gupta 8a0f553fd3 Bug 1264017 - Add synthesized mouse support to Android. r=rbarker
MozReview-Commit-ID: HT4U7WKTd5Z
2016-05-16 12:17:17 -04:00
Dylan Roeh 609b4c21e0 Bug 1271103 - Remove possible race condition in GLController.java. r=snorp 2016-05-13 13:43:06 -05:00
Jan-Ivar Bruaroey 93cbd13c88 Bug 802326 - remove "No Video" and "No Audio" choices in cam+mic permission prompt on android. r=sebastian
MozReview-Commit-ID: DyYcKkbpBVl

--HG--
extra : rebase_source : f5fee0f6b283ddcceb7e79b352c7afabd6af6f32
2016-05-05 22:41:26 -04:00
Carsten "Tomcat" Book 50dfc69f35 merge mozilla-inbound to mozilla-central a=merge 2016-05-13 11:59:20 +02:00
L. David Baron d097996b85 Bug 1111440 - Replace -moz- prefixed logical margin/padding/border properties with their standard versions. r=heycam
This patch was generated by the command:
  find . -name "*.css" -exec sed -i -f mozpropsub {} \;
in the root of a mozilla-central tree, with the file mozpropsub
containing the contents:
s/-moz-padding-end\>/padding-inline-end/g
s/-moz-padding-start\>/padding-inline-start/g
s/-moz-margin-end\>/margin-inline-end/g
s/-moz-margin-start\>/margin-inline-start/g
s/-moz-border-end\>/border-inline-end/g
s/-moz-border-end-color\>/border-inline-end-color/g
s/-moz-border-end-style\>/border-inline-end-style/g
s/-moz-border-end-width\>/border-inline-end-width/g
s/-moz-border-start\>/border-inline-start/g
s/-moz-border-start-color\>/border-inline-start-color/g
s/-moz-border-start-style\>/border-inline-start-style/g
s/-moz-border-start-width\>/border-inline-start-width/g

While I didn't manually review all the changes, I did review the list of
files, and manually reviewed the changes in the files that I thought
were more interesting.

Note that there are a few tests that should be fixed up as well, but
I'll do that in a later patch.

MozReview-Commit-ID: EiQTuuV0MNQ
2016-05-12 22:19:58 -07:00
Michael Comella 9e8fce6617 Bug 1270213 - Add comment explaining pruning behavior. r=me
This was prompted in review and was discussed in bug so I didn't request
review.

MozReview-Commit-ID: ERgQ3hQnZai

--HG--
extra : rebase_source : c197b93febf275265e0d13891b241ae93c465a0d
2016-05-12 10:55:20 -07:00
Michael Comella 83ba5b69af Bug 1270213 - Move PingStore* to doc ID filenames. r=sebastian
The code is now expected to compile.

MozReview-Commit-ID: 76dHW9gmyTl

--HG--
extra : rebase_source : a9e6578133e1a7d935af4943c7a1c92ece7eedf5
2016-05-05 17:49:47 -07:00
Michael Comella e0f8ab936b Bug 1270213 - Update TelemetryUploadService to use doc ID. r=sebastian
This is not yet expected to compile.

MozReview-Commit-ID: FQF6z5ni6jC

--HG--
extra : rebase_source : bd7ccc97e44a17f66122242d28e030762c645ee9
2016-05-05 16:52:58 -07:00
Michael Comella efe06ac7a9 Bug 1270213 - Update TelemetryPing & builders to use docID. r=sebastian
Future patches will change the remaining code - This is not yet expected
to compile.

MozReview-Commit-ID: FpqfThcV7dj

--HG--
extra : rebase_source : e01ea217aadd88853d6643c5642d866ba796aa81
2016-05-05 16:32:40 -07:00
Michael Comella 00cba0fcf9 Bug 1270213 - Factor lockAndReadJSONFromFile out from getAllPings. r=sebastian r=sebastian
MozReview-Commit-ID: HtUkO0n50px

--HG--
extra : rebase_source : 03a91752862b02afd0319d9c9f13894cf1cad55b
2016-05-05 14:37:02 -07:00
Michael Comella b712f57236 Bug 1270213 - Add UUIDUtil.isUUID. r=sebastian
MozReview-Commit-ID: S5BbzEVEka

--HG--
extra : rebase_source : 6ae0a62d4747cb2fd9df23a0604918461c5359b1
2016-05-05 16:56:38 -07:00
Michael Comella ded6c511f3 Bug 1270213 - Add FileLastModifiedComparator. r=sebastian
MozReview-Commit-ID: 6JbQoqYbZsn

--HG--
extra : rebase_source : 491b337169b724467db53a584b147e751ad50a05
2016-05-05 14:42:34 -07:00
Michael Comella 56717d85c7 Bug 1270213 - Move generic file filters to FileUtil. r=sebastian
These will be used by the Store in the upcoming patches.

MozReview-Commit-ID: 7sPICagdLMu

--HG--
extra : rebase_source : a7ec0a82f48fde4480ab89ec6f39f6e073c31c71
2016-05-05 17:10:57 -07:00
Margaret Leibovic 61c1f80284 Bug 1267837 - Update grid item telemetry to indicate whether an item is pinned. r=mfinkle
MozReview-Commit-ID: 9Et4AhCzAr9

--HG--
extra : rebase_source : b901745bd6ae2b26690491be9cbe8020d85a2931
2016-05-11 11:40:49 -04:00
Carsten "Tomcat" Book 868e217e88 merge mozilla-inbound to mozilla-central a=merge 2016-05-12 11:54:10 +02:00
Michael Comella 05393aefa8 Bug 1271805 - Update color of pressed item in the long-press back history menu. r=ahunt
MozReview-Commit-ID: 5q45HtRfv1l

--HG--
rename : mobile/android/base/resources/color/pressed_about_page_header_grey.xml => mobile/android/base/resources/color/state_pressed_toolbar_grey_pressed.xml
extra : rebase_source : b9a836ec3ca4a5ddbaf741ad7b3f8a6a6f8cc8bd
2016-05-10 14:43:54 -07:00
Michael Comella a15efa04eb Bug 1268603 - Set history background color to @null. r=ahunt
See added comment (and bug it references) for details.

MozReview-Commit-ID: CqS5Oy7MPln

--HG--
extra : rebase_source : a64c5d134d0f2d4bc46ede356a5e8517654e9c62
2016-05-10 14:19:02 -07:00
Grigory Kruglov 5f6c8ef806 Bug 1233250: use correct string name for offline message r=me
MozReview-Commit-ID: CNf7cg0S1Zb

--HG--
extra : rebase_source : a15ea4c263e6e938091ad8396988ff0718056404
extra : amend_source : 53c817f0a9b5a9011f23c9bfce1f025010353cb8
2016-05-11 08:38:44 -07:00
Sebastian Kaspari 9c54ec6987 Bug 1270529 - lookupProxy(): Return null if port is -1. r=ahunt
We already return null if the host is empty and all callers seem to handle null values.

MozReview-Commit-ID: 4utRbvf7To3

--HG--
extra : rebase_source : 3236e7d6c518cf1041699101f8eef34b0ef19609
2016-05-09 20:08:12 +02:00
Grigory Kruglov 348655f801 Bug 1233250: Part 2 - Better copy for "loaded from cache" snackbar r=sebastian
MozReview-Commit-ID: 1TZnFlU6Mo7

--HG--
extra : rebase_source : ad28ba459bac7c7fd3e9f32bc6c372220a552573
2016-05-10 17:35:40 -07:00
Grigory Kruglov 1b5d965b08 Bug 1233250: Part 1 - Set offline snackbar background to link_blue r=sebastian
MozReview-Commit-ID: Bjc1RO95Hx

--HG--
extra : rebase_source : 1ee6d97a05f75d0ce893a48cb0123291f0d318ae
2016-05-06 11:32:52 -07:00
Grigory Kruglov d83efeb11a Bug 1233250: Pre - allow specifying snackbar's backgroundColor via Snackbars.jsm r=sebastian
MozReview-Commit-ID: FQqUKE6sLHS

--HG--
extra : rebase_source : 10e8826a07c48081a0e4ea67a17d00114e24844c
2016-05-10 17:35:08 -07:00
Andrzej Hunt 3bf0a9dfae Bug 1269774 - Reduce browser menu top padding r=sebastian
We want to have equal paddings for the top and right hand side of the
menu, whereas we previously had 24dp padding for the top, and only 8dp
on the right.

Note: the padding is defined in the 9-patch files, this commit simply
removes empty vertical space from the top of the menu background images.

MozReview-Commit-ID: Db0hXsPOVpp
2016-05-10 20:25:14 -07:00
Andrzej Hunt e4b140e694 Bug 1269774 - Show browser menu over the menu button r=sebastian
Note: this commit alone results in the menu looking slightly odd
due to different top and right paddings. These are fixed in the
next commit.

MozReview-Commit-ID: AWzYU067K0W
2016-05-10 20:25:12 -07:00
Andrzej Hunt 55d7bfc179 Bug 1269774 - Remove dividers from browser menu r=sebastian
This removes dividers from the main menu, and also the tab-tray menu.

MozReview-Commit-ID: CztHJcrEHpK
2016-05-10 20:25:10 -07:00
Andrzej Hunt 7bd1fdb79a Bug 1269774 - Fix padding for context menu icons r=sebastian
The icons in the first row require more padding. In the second
row the share icons should have more padding, but only on phones,
and all other icons should remain the same size. (On tablets
the share icon can be shown beside the bookmark star, hence
we use an inset drawable to add padding on phones, and then
provide an alternative 0-inset on tablets to avoid any changes
there.)

MozReview-Commit-ID: 54NzYtUpzuV


--HG--
rename : mobile/android/base/resources/drawable-hdpi/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi/ic_menu_share_icon.png
rename : mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_share_icon.png
rename : mobile/android/base/resources/drawable-xxhdpi/ic_menu_share.png => mobile/android/base/resources/drawable-xxhdpi/ic_menu_share_icon.png
2016-05-10 20:25:02 -07:00
Andrzej Hunt e2fd29e204 Bug 1269774 - Fix bookmark star artifacts r=sebastian
These images were incorrectly saved, leading to the loss of the smooth
edges they should have. This commit replaces the edited bookmark stars
with higher quality versions.

MozReview-Commit-ID: 1Z8FfWrvl8H
2016-05-10 20:04:00 -07:00
Matthew Wein 29d46dc602 Bug 1267124 - Implement chrome.pageAction.show on Android. r=kmag, r=margaret
MozReview-Commit-ID: AOwfuuCfhRx

--HG--
rename : browser/components/extensions/extension.svg => mobile/android/components/extensions/extension.svg
rename : browser/components/extensions/schemas/page_action.json => mobile/android/components/extensions/schemas/page_action.json
extra : transplant_source : %13%D1%E2%3Ax3%12%C9%81%E9%1Ct%3E3T%9Br%E0%DBP
2016-04-27 19:06:24 -04:00
Randall Barker c63841d754 Bug 1229462 - Use Android OverScroller class for fling animation r=botond 2016-05-11 08:37:47 -07:00
Wes Kocher 26012d19b7 Backed out 4 changesets (bug 1266235) for test_ev_certs.js failures on pretty much every platform CLOSED TREE
Backed out changeset f684fac95bd9 (bug 1266235)
Backed out changeset f560cba61749 (bug 1266235)
Backed out changeset 5f321f10da1e (bug 1266235)
Backed out changeset 93deaa5641bc (bug 1266235)

--HG--
rename : services/common/blocklist-clients.js => services/common/KintoBlocklist.js
rename : services/common/blocklist-updater.js => services/common/kinto-updater.js
rename : services/common/tests/unit/test_blocklist_clients.js => services/common/tests/unit/test_kintoAddonPluginBlocklist.js
rename : services/common/tests/unit/test_blocklist_certificates.js => services/common/tests/unit/test_kintoCertBlocklist.js
rename : services/common/tests/unit/test_blocklist_updater.js => services/common/tests/unit/test_kinto_updater.js
2016-05-10 13:46:28 -07:00
Mathieu Leplatre 031d6fbdbb Bug 1266235 - Move blocklist preferences to all.js. r=MattN
Related:

* https://bugzilla.mozilla.org/show_bug.cgi?id=1248557
* https://bugzilla.mozilla.org/show_bug.cgi?id=1259947

MozReview-Commit-ID: H2Eh1oqXeS1

--HG--
extra : transplant_source : %A0%96%22%DB%F3%19%8A%CF%A9%3B%FB%11%27%FB%E7%7B%BCzH%9F
2016-04-29 13:17:09 +02:00
Mathieu Leplatre 34370ce5a8 Bug 1266235 - Use blocklist prefix in preference names. r=Mattn
MozReview-Commit-ID: 5aeoiSEMwYw

--HG--
extra : amend_source : bb232bb34c7a25abffac36531d5ab4d8e9c6c7af
extra : transplant_source : K%1A1d%EEc%8FY%030NRb%AFD%00.%40U8
2016-04-29 12:48:45 +02:00
Carsten "Tomcat" Book e07e80ac43 merge mozilla-inbound to mozilla-central a=merge 2016-05-10 12:05:56 +02:00
Michael Comella 9309f07f19 Bug 1271175 - Backed out changeset 537e8f7a4950 (bug 1258450) for crashes.
MozReview-Commit-ID: HL5glRsq6r9

--HG--
extra : rebase_source : 11b9a9706f1ce85e07a170786b85f630c79931a1
2016-05-09 16:01:03 -07:00
Jim Chen eb7204d3b6 Bug 1269682 - Always detect guest mode first; r=margaret
Always check for guest mode even if we don't have arguments, because
we can still be in guest mode even if we don't have arguments.
2016-05-09 22:31:18 -04:00
Jim Chen a66b611509 Bug 1269682 - Don't try to switch to guest profile; r=margaret
BrowserApp has a snippet that tries to restart in guest profile if we're
supposed to be in it, but are currently not. This is vestigial code from
lock screen widget support, and should not be needed anymore.
2016-05-09 22:31:18 -04:00
Jim Chen af5e39288f Bug 1269682 - Guard against onPause being called without onResume; r=ahunt
When we try to restart Fennec immediately after launching Fennec, it's
possible for onPause to be called without a corresponding onResume being
called first. This patch guards against registering events twice due to
this quirk.
2016-05-09 22:31:18 -04:00
Eugen Sawin 5b93d93294 Bug 1268471 - [2.1] Remove doorhanger bug workround. r=esawin 2016-05-09 22:59:18 +02:00
Eugen Sawin cc7d011af2 Bug 1268471 - [1.1] Restore doorhanger title after removal. r=liuche 2016-05-09 22:59:17 +02:00
Jorick Caberio d2fafdf8d7 Bug 1264480 - Moved Distribution.ReadyCallback @WorkerThread annotation to the individual methods. r=mcomella
MozReview-Commit-ID: 9lG2SPyPyP9

--HG--
extra : rebase_source : 20993d9db129261fad804f4d417db9fb44169cb7
2016-04-14 18:13:52 +08:00
Andrzej Hunt 17a2b79f2f Bug 1060544 - Post: add comment explaining how our about:home restoration is incorrect r=liuche
MozReview-Commit-ID: 30Q2KEPFyKL

--HG--
extra : rebase_source : 5a23be37119b4c5247a31618302eea63a34e6923
2016-04-29 16:02:49 +02:00