Commit Graph

20597 Commits

Author SHA1 Message Date
Chenxia Liu
995e1d45af Bug 1279807 - History panel smartfolder icons are much too big on HDPI devices. r=JanH
MozReview-Commit-ID: 3QzOl0Fh4Cm

--HG--
extra : rebase_source : 5a8056d4d61002a0de899539276a7f44dafcbee0
2016-06-15 11:26:07 +01:00
Carsten "Tomcat" Book
58167fd092 merge mozilla-inbound to mozilla-central a=merge 2016-06-15 06:24:33 +01:00
Jan Henning
5c94369e27 Bug 1279273 - Use correct synchronization object for session data parsing. r=sebastian
If the main thread has to wait for the session data parsing to finish - which is more likely when you've got many tabs open, meaning a large sessionstore.js file - it does so on "this", i.e. GeckoApp.
The session data parsing itself is done from within a Runnable, so we need to qualify "this" there if we want it to refer to GeckoApp itself, so we can successfully release any waiting threads through notifyAll().

MozReview-Commit-ID: 3LhJsI5rNU3

--HG--
extra : transplant_source : %27%27X%9CTm%A6%88%3F%1B%8Cm%0E4%F1%9D%9B%E5%F2%28
2016-06-12 19:45:50 +02:00
Sebastian Kaspari
42d21c59e5 Bug 1276696 - Put custom tabs support behind a build flag. r=mcomella
MozReview-Commit-ID: 44wtCsZWZv2

--HG--
extra : rebase_source : 2ab062e4f5155225d6f5fcd686cd7a0b974679f1
2016-05-30 16:48:45 +02:00
Sebastian Kaspari
2e5288b993 Bug 1276696 - Add dummy service for custom tabs. r=mcomella
Currently this service does not implement any of the callbacks. However it is
necessary to be detected as an app supporting custom tabs.

MozReview-Commit-ID: Hz99Gp9aQCX

--HG--
extra : rebase_source : b73730f5c4d497e4fef5ed9bab3ae1c50e43de61
2016-05-25 19:31:10 +02:00
Sebastian Kaspari
fbfb7a9f62 Bug 1276696 - Add CustomTabsActivity based on GeckoApp. r=mcomella
This activity doesn't do much yet and just has a layout including a GeckoView.
Some basic behavior from GeckoApp is working though: Context menus, floating
text selection, snackbars.

MozReview-Commit-ID: C6SJeYz609h

--HG--
extra : rebase_source : c65d8657ed795365b81c9bfeda41ac814760db8d
2016-05-25 19:58:17 +02:00
Sebastian Kaspari
38f5ea7b19 Bug 1276696 - Add custom tabs support library. r=mcomella
MozReview-Commit-ID: LXie1GiV4gV

--HG--
extra : rebase_source : 7316ebbe6512db64364c0a4f450e0758f79fcc5c
2016-06-10 11:01:11 +02:00
Kris Maglione
a1dac7caad Bug 1279392: [webext] Move API permission definitions to the schemas. r=aswan
MozReview-Commit-ID: 8m7wJrAbFwS

--HG--
extra : source : a00cf073f5c00380d4e42b13bc0cd3146b708845
extra : amend_source : d74ef90e88acbe62e33af3b5b9cf870d5c0a9d3e
2016-06-09 17:44:47 -07:00
Sebastian Hengst
f8035f62a8 Backed out changeset a00cf073f5c0 (bug 1279392) for failing mochitest test_ext_contentscript_create_iframe.html at least on Linux x64 opt. r=backout 2016-06-14 13:37:52 +02:00
Kris Maglione
b465305345 Bug 1279392: [webext] Move API permission definitions to the schemas. r=aswan
MozReview-Commit-ID: 8m7wJrAbFwS

--HG--
extra : rebase_source : cba877c0ef400917b0b7e5913895e64ebefb34b9
extra : amend_source : 6e943015e3e00854c431cbd653994a6734e66ce4
2016-06-09 17:44:47 -07:00
Sebastian Kaspari
281fbb76c7 Bug 1276696 - Introduce new LauncherActivity that will handle all incoming Intents. r=mcomella
We will need to dispatch Intent objects to different destinations (Browser, Custom Tab and eventually
progressive web apps).

The logic of TabQueueDispatcher is folded into this new activity.

MozReview-Commit-ID: 3P4eIvtAKEW

--HG--
extra : rebase_source : 3d7604a7bdbd2ea80602313e7bc66212a089994b
2016-05-15 14:25:12 +02:00
Sebastian Kaspari
99a05c4022 Bug 1279137 - Update media notification icons. r=ahunt
MozReview-Commit-ID: pGSX3yRhtQ

--HG--
extra : rebase_source : ce3c4db4cc36887dbf3d055029f515471d0adeb7
2016-06-10 17:18:57 +02:00
Mike Hommey
c5caa62fdf Bug 1278456 - Add the tooltool GCC library directory to LD_LIBRARY_PATH on Linux builds. r=mshal
Build slaves on automation are based on Centos 6, which doesn't have a
recent enough version of libstdc++ for our new requirements. But since
we're building with a recent GCC or clang with its own libstdc++, we do
have such a libstdc++ available somewhere, and the compiler picks it
when invoking the linker.

Problems start happening when we execute some of the built programs
during the build, like host tools (e.g. nsinstall), or target programs
(xpcshell, during packaging). In that case, we need the compiler's
libstdc++ to be used. Which required adding the GCC or clang library
directory to LD_LIBRARY_PATH.

Unconveniently enough, the clang 3.5 tooltool package we're using for
ASAN builds until we can update to at least 3.8 (bug 1278718) doesn't
contain libstdc++.so. So for those builds, pull the GCC package from
tooltool as well, and pick libstdc++ from there.
2016-06-12 18:52:15 +09:00
Kevin Lam
e730d38cc4 Bug 1245952 - Corrected comment in localization note to reference the corresponding string. r=mcomella 2016-06-08 18:08:00 +02:00
Andrzej Hunt
9bc92c22aa Bug 1279598 - Fix checkstyle trailing space issues r=me 2016-06-10 12:26:32 -07:00
Kit Cambridge
d7d8f3175e Bug 1279306 - Use the production push server URL on Android. r=margaret
MozReview-Commit-ID: Fy347g00Lx0

--HG--
extra : rebase_source : afc91bac255bdd21811c7e381c17477f6608fd7c
2016-06-09 17:13:39 -07:00
Michael Comella
db493df167 Bug 1261494 - Block Gecko from screwing with the client ID file by resetting the cache at the last minute. r=grisha
MozReview-Commit-ID: EZYrk8IiRiF

--HG--
extra : rebase_source : 420c4e802c6d234a594b9f17670791e0029e237e
2016-06-07 15:32:04 -07:00
Andrzej Hunt
a957702d89 Bug 1278221 - Manually find the toolbar in order to show options menu r=sebastian
Workaround for an Android support library bug

MozReview-Commit-ID: GD023N7tEWu

--HG--
extra : amend_source : 32aedac981aed488b144e67b74d41f5c89fa2218
2016-06-06 14:16:35 -07:00
Andrzej Hunt
780866f050 Bug 1278725 - Restore original "up" arrow scaling r=liuche
Before introducing the folder count, the bookmark folder icon
was set as the drawable on a TextView. This actually resulted
in scaling that doesn't preserve the aspect ratio. To reproduce
this in the new ImageView (added when we switched to a two-line
folder layout), we simply need to set the icon size explicitly
and scale to fit the whole area (as opposed to setting two
constraints and fitting while preserving aspect ratio).

The folder/reading-list icons are unaffected as they already
have the expected aspect-ratio, the back-arrow is now scaled
as expected.

MozReview-Commit-ID: Fl5JY3Lznau

--HG--
extra : amend_source : f3ad6cddd9a162953913b3161b9a5ceea6d3e15e
2016-06-09 10:32:24 -07:00
Carsten "Tomcat" Book
48d4127667 Merge mozilla-central to fx-team 2016-06-10 15:42:51 +02:00
Carsten "Tomcat" Book
4ee1ed2b8f merge mozilla-inbound to central a=merge
--HG--
extra : amend_source : 10247ace8885c608987dcf31d47368e0dec09b19
2016-06-10 15:39:23 +02:00
Andrzej Hunt
78fcdad415 Bug 1279332 - Backed out 97074800423c since it depends on a commit breaking background runnables r=sebastian
MozReview-Commit-ID: 6jYh8ipOw3q

--HG--
extra : amend_source : 4f555ee43fd63f66d533d7822c3659ba466096b1
2016-06-10 04:30:26 -07:00
Andrzej Hunt
ccaf1e0177 Bug 1279332 - Backed out 61442f7ad442 for breaking background runnables r=sebastian
MozReview-Commit-ID: SxRbixXO6i
2016-06-10 04:29:34 -07:00
Sebastian Kaspari
cecda1d1a1 Bug 1227538 - Reset site identity after entering new URL. r=margaret
MozReview-Commit-ID: oOPYDUPVq9

--HG--
extra : amend_source : f12a0204a2e17a5c5cd6d5a62a1d11561e44dbc4
2016-06-07 16:54:13 +02:00
Sebastian Hengst
7b6fdf9c59 Backed out changeset 50b1d3506786 (bug 1279332) for various Android robocop failures. r=backout 2016-06-10 10:29:43 +02:00
Sebastian Hengst
e7404c9b70 Backed out changeset 6a35c7a791a6 (bug 1279332) 2016-06-10 10:29:03 +02:00
Sebastian Hengst
668c8a3010 Backed out changeset 59fbde27dc99 (bug 1279332) 2016-06-10 10:28:59 +02:00
dlim@mozilla.com
d232e864de Bug 1270124 - "Make Firefox Default Browser" option is missing from Tablet. r=grisha
MozReview-Commit-ID: EpJWTJUdu6I

--HG--
extra : transplant_source : T%FFx%8F_%27%29%0B%94%D9%0Bu%11ko%05%1A%EF%DFu
2016-06-07 09:55:23 -07:00
Andrzej Hunt
13b79044fe Bug 1279332 - Post: remove unrelated whitespace to pacify checkstyle r=me
MozReview-Commit-ID: 3FjBkueZ45z

--HG--
extra : rebase_source : d8c2467166622c44ed4916dd4ef595f3f5b1479a
2016-06-09 16:01:51 -07:00
Andrzej Hunt
ca8ea28ccc Bug 1279332 - Document that onTargetSelected should be run on the UI thread r=grisha
MozReview-Commit-ID: IJ7UItFhvtE

--HG--
extra : rebase_source : 21c8447deae4c7fee221ecfb7cc73076f88f0c26
2016-06-09 15:59:48 -07:00
Andrzej Hunt
0e9eacd33c Bug 1279332 - Perform UI callback on UI thread to avoid crashing the background thread r=grisha
We're now calling setIntent on the background thread. The onTargetSelected callback expects
to be run on the UI thread, and it looks like Android hangs up when we call UI methods
on the background thread. This in turn means the entire background thread gets locked up
(we execute tasks on the background thread sequentially) and no further background runnables
are executed. This breaks anything else requiring use of the background thread, e.g.
favicon generation, search, permissions doorhangers, etc.

MozReview-Commit-ID: CoYUOMqNX0m

--HG--
extra : rebase_source : 84a4dcc8a8aad590f02ba9f8d8b2564922787d17
2016-06-09 15:58:43 -07:00
Chenxia Liu
83a8bff8c3 Bug 1279336 - Explicitly do not scale smartfolder icons. r=jonalmeida
MozReview-Commit-ID: 9TEiecbLoy8

--HG--
extra : rebase_source : 83cfb4710dc0c3a6bf605901ed1ba004e4937430
2016-06-09 13:59:02 -07:00
Michael Comella
880da0b4f9 Bug 1241685 - Add brief javadoc to assist with testing. r=ahunt
MozReview-Commit-ID: 3epPlVfJSLx

--HG--
extra : rebase_source : 567fea8c61f8cb7bb01feb4d3e4e3f4a03ef4cfc
2016-06-08 17:21:45 -07:00
Michael Comella
8de14c09db Bug 1241685 - Hook up TelemetryPreferences for telemetry server url. r=ahunt
In this patch, I move the telemetry server preference from app preferences
to per-profile preferences. We never allowed the user to set the preference
so this should cause no issues.

MozReview-Commit-ID: 7D5y58R2ejd

--HG--
extra : rebase_source : 3b4214968cac48150f6a3f873967cb43c7952b1b
2016-06-08 16:53:50 -07:00
Michael Comella
dbd6e16080 Bug 1241685 - Add TelemetryPreferences. r=ahunt
MozReview-Commit-ID: 5Tw0GUX0tmW

--HG--
extra : rebase_source : 627a1ae0df2923dcc64f186453e46cc70579a080
2016-06-08 17:20:31 -07:00
Michael Comella
b053ea4034 Bug 1279045 - Remove broadcastHealthReport* and its call sites. r=ahunt
MozReview-Commit-ID: G5Pz9l5GAi3

--HG--
extra : rebase_source : fc0d120dee707668981a3e65afd57dc582892484
2016-06-08 13:50:12 -07:00
Carsten "Tomcat" Book
733a4f6de5 merge mozilla-inbound to mozilla-central a=merge 2016-06-09 11:58:06 +02:00
Wes Kocher
e0c9a7bf97 Merge m-c to fx-team, a=merge 2016-06-08 17:13:46 -07:00
Wes Kocher
07d01350a8 Merge fx-team to central, a=merge 2016-06-08 17:06:18 -07:00
Michael Comella
8af3a21e3c Bug 1244316 - Don't upload in restricted profiles when admin disables FHR. r=sebastian
Edge case: the admin profile can disable health report upload for themselves
but (I assume) the new profile won't automatically match these settings. While
I'm not sure if this is even possible, it's outside the scope of this bug.

MozReview-Commit-ID: 1SkXhL7B5xb

--HG--
extra : rebase_source : 95540b8b76f7014544022c7cb0880791ac536721
2016-06-07 14:04:06 -07:00
Andrzej Hunt
346739a504 Bug 1264489 - Avoid DB access in UI thread from onPrepareOptionsMenu r=mcomella
DB access happens deep in the internals of setting a new Intent for our
ActionProvider. Posting this to a background thread here seems to be the simplest
option to ensure correct threading.

MozReview-Commit-ID: 3iS8w5Cxf02

--HG--
extra : rebase_source : 48c90e5fa47a470d3360dbd44dc97111aac5ff3e
2016-06-06 10:42:12 -07:00
Andrzej Hunt
4c8562527c Bug 1264489 - Pre: assert DB access is on background thread in debug builds r=mcomella
It's possible there are more UI-thread DB accesses lurking. To avoid maintenance burden
we should therefore enable this assert only in debug builds - releases will be
unaffected, but we can still notice incorrect DB access during development.

MozReview-Commit-ID: Kgzf1L3WjIE

--HG--
extra : rebase_source : b1f9f01ea746c005a038693aaa5eddb2bb103a2b
2016-06-07 08:57:19 -07:00
Kit Cambridge
22e7cd6527 Bug 1278689 - Remove push subscriptions when clearing site settings on Android. r=margaret
MozReview-Commit-ID: BrOjKzswY1F

--HG--
extra : rebase_source : 8230eecf5fd5caaaceb1784c4a61967c46430a3a
2016-06-07 14:02:55 -07:00
Justin D'Arcangelo
26ebe8e651 Bug 1272102 - FlyWeb Android UI. r=sebastian
--HG--
extra : amend_source : b1bac8800988d31790a64a293403336375e5effd
2016-06-08 21:37:06 -04:00
Matthew Wein
395d540421 Part 2: Implement {set|get}Popup for chrome.pageAction (Bug 1264118) r=kmag
MozReview-Commit-ID: 1ZyQgs8ktic

--HG--
extra : rebase_source : 43777c1dc4d6196215d0ae5ded00adc51fe8300f
extra : histedit_source : 22104c8d20405429f271b91439395d13f0846768
2016-05-30 19:42:03 -07:00
Matthew Wein
494256ef31 Part 1: Implement default_popup for chrome.pageAction (Bug 1264118) r=kmag
MozReview-Commit-ID: BrV0v66BhBz

--HG--
extra : rebase_source : ec0b567c7ea3860960fb7d25f089cc053bae39b0
extra : histedit_source : d0a4e4bc6b60454eccdf017bd48ced992b87c5f9
2016-06-02 16:14:20 -04:00
Dylan Roeh
26e9a5cd2f Bug 1136364 - Move EGLSurface creation out of GLController.java. r=snorp 2016-06-08 08:38:45 -05:00
Dustin J. Mitchell
62577b229f Bug 1275409: move legacy taskcluster-related scripts to taskcluster/scripts; r=wcosta
MozReview-Commit-ID: 7ilVJkNAPvE

--HG--
rename : testing/taskcluster/scripts/builder/build-emulator-x86.sh => taskcluster/scripts/builder/build-emulator-x86.sh
rename : testing/taskcluster/scripts/builder/build-emulator.sh => taskcluster/scripts/builder/build-emulator.sh
rename : testing/taskcluster/scripts/builder/build-haz-linux.sh => taskcluster/scripts/builder/build-haz-linux.sh
rename : testing/taskcluster/scripts/builder/build-linux.sh => taskcluster/scripts/builder/build-linux.sh
rename : testing/taskcluster/scripts/builder/build-mulet-haz-linux.sh => taskcluster/scripts/builder/build-mulet-haz-linux.sh
rename : testing/taskcluster/scripts/builder/build-mulet-linux.sh => taskcluster/scripts/builder/build-mulet-linux.sh
rename : testing/taskcluster/scripts/builder/build-simulator.sh => taskcluster/scripts/builder/build-simulator.sh
rename : testing/taskcluster/scripts/builder/build-sm-package.sh => taskcluster/scripts/builder/build-sm-package.sh
rename : testing/taskcluster/scripts/builder/build-sm.sh => taskcluster/scripts/builder/build-sm.sh
rename : testing/taskcluster/scripts/builder/desktop-setup.sh => taskcluster/scripts/builder/desktop-setup.sh
rename : testing/taskcluster/scripts/builder/gaia_props.py => taskcluster/scripts/builder/gaia_props.py
rename : testing/taskcluster/scripts/builder/get-objdir.py => taskcluster/scripts/builder/get-objdir.py
rename : testing/taskcluster/scripts/builder/hazard-analysis.sh => taskcluster/scripts/builder/hazard-analysis.sh
rename : testing/taskcluster/scripts/builder/install-packages.sh => taskcluster/scripts/builder/install-packages.sh
rename : testing/taskcluster/scripts/builder/pull-gaia.sh => taskcluster/scripts/builder/pull-gaia.sh
rename : testing/taskcluster/scripts/builder/setup-ccache.sh => taskcluster/scripts/builder/setup-ccache.sh
rename : testing/taskcluster/scripts/builder/sm-tooltool-config.sh => taskcluster/scripts/builder/sm-tooltool-config.sh
rename : testing/taskcluster/scripts/copy.sh => taskcluster/scripts/copy.sh
rename : testing/taskcluster/scripts/misc/build-cctools.sh => taskcluster/scripts/misc/build-cctools.sh
rename : testing/taskcluster/scripts/misc/build-clang-linux.sh => taskcluster/scripts/misc/build-clang-linux.sh
rename : testing/taskcluster/scripts/misc/build-gcc-linux.sh => taskcluster/scripts/misc/build-gcc-linux.sh
rename : testing/taskcluster/scripts/misc/minidump_stackwalk.sh => taskcluster/scripts/misc/minidump_stackwalk.sh
rename : testing/taskcluster/scripts/misc/repackage-jdk-centos.sh => taskcluster/scripts/misc/repackage-jdk-centos.sh
rename : testing/taskcluster/scripts/phone-builder/build-dolphin.sh => taskcluster/scripts/phone-builder/build-dolphin.sh
rename : testing/taskcluster/scripts/phone-builder/build-phone-ota.sh => taskcluster/scripts/phone-builder/build-phone-ota.sh
rename : testing/taskcluster/scripts/phone-builder/build-phone.sh => taskcluster/scripts/phone-builder/build-phone.sh
rename : testing/taskcluster/scripts/phone-builder/post-build.sh => taskcluster/scripts/phone-builder/post-build.sh
rename : testing/taskcluster/scripts/phone-builder/pre-build.sh => taskcluster/scripts/phone-builder/pre-build.sh
rename : testing/taskcluster/scripts/tester/harness-test-linux.sh => taskcluster/scripts/tester/harness-test-linux.sh
rename : testing/taskcluster/scripts/tester/test-b2g.sh => taskcluster/scripts/tester/test-b2g.sh
rename : testing/taskcluster/scripts/tester/test-linux.sh => taskcluster/scripts/tester/test-linux.sh
extra : rebase_source : 647914c181227d78a0694cf1417fbfe466a5c20d
2016-06-04 22:57:41 +00:00
Carsten "Tomcat" Book
6439e7004c merge mozilla-inbound to mozilla-central a=merge 2016-06-08 11:57:53 +02:00
Carsten "Tomcat" Book
1bd67fd288 merge fx-team to mozilla-central a=merge 2016-06-08 11:56:38 +02:00