Commit Graph

20456 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
71eb3110f9 merge mozilla-inbound to mozilla-central a=merge 2016-06-03 12:00:06 +02:00
Michael Comella
af565b6cbb Bug 1277214 - Move MOZ_DISABLE_* to single MOZ_IN_AUTOMATION env var. r=grisha
We hit an issue where adding a new env var, MOZ_DISABLE_TELEMETRY, added env10
and caused crashes. I suspect the issue is that there are is now a double-digit
number of env vars (bug 1277390). Here, we do the quick fix by removing
MOZ_DISABLE_TELEMETRY & repurposing MOZ_DISABLE_SWITCHBOARD to be generic.

While we're at it, we simplify the code by making the setDisabled methods a
strict getter without checking for how many times they're called.

MozReview-Commit-ID: 19DDbVYRZ2

--HG--
extra : rebase_source : 1590ae4f49bf725ab8a3bb26f10dab324903aa8c
2016-06-01 16:46:44 -07:00
Michael Comella
4bbd712e84 Bug 1277214 - Stop reading env vars when the key no longer exists. r=grisha
In the previous implementation, we'd stop reading when the value would return
null, however, this breaks with SafeIntents where null is returned if a value
throws a runtime exception - i.e. we might stop reading at env2 if it throws
even though env3+ exist.

MozReview-Commit-ID: 7iZgUAjBSmB

--HG--
extra : rebase_source : a7440dd14bb406afcd6ac1ec514bf0b188b5b2b7
2016-06-01 16:29:26 -07:00
Michael Comella
aaa16e308e Bug 1277214 - Use SafeIntent in getEnvVarMap. r=grisha
MozReview-Commit-ID: 5eXjgCsd6Rl

--HG--
extra : rebase_source : 4c6c9cf2b41cd5ba236c273104723bc9f6e3dafc
2016-06-01 15:34:34 -07:00
Michael Comella
dd4052c5e0 Bug 1277214 - Move remaining SafeIntentUtils functions to IntentUtils. r=grisha
I feel this better follows the util class pattern: IntentUtils acts on Intents
as StringUtils would act on Strings.

MozReview-Commit-ID: 7n2B9q1KlSy

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/util/SafeIntent.java => mobile/android/base/java/org/mozilla/gecko/mozglue/SafeIntent.java
extra : rebase_source : ac953ac44f91f1d9b8fa4c0c2a21c539974e9df8
2016-06-01 15:32:41 -07:00
Michael Comella
200e23d1c7 Bug 1277214 - Move SafeIntent to its own class. r=grisha
This gets used often enough that it's annoying to do full class name imports.

MozReview-Commit-ID: 7Yhp1NCgwQw

--HG--
extra : rebase_source : 4e4875153d171d8eb4c8ce49f8a6e6170ac5c616
2016-06-01 15:27:41 -07:00
Michael Comella
9fda412bd8 Bug 1277214 - Add javadoc to explain SafeIntent. r=grisha
MozReview-Commit-ID: LqQm6yAKbr5

--HG--
extra : rebase_source : ddad22a46263fd13955b89828547158c9c723ecb
2016-06-01 15:21:36 -07:00
Carsten "Tomcat" Book
91c45dd470 Merge mozilla-central to fx-team 2016-06-02 12:00:53 +02:00
Carsten "Tomcat" Book
e0f231ace5 merge mozilla-inbound to mozilla-central a=merge 2016-06-02 11:56:07 +02:00
Michael Comella
aeb8cb76b8 Bug 1273689 - review - remove inner class & move methods to containing class; use BrowserAppDelegateWithReference. r=me
It's all a little cleaner.
2016-06-01 17:46:19 -07:00
Michael Comella
790cfdc8dd Bug 1273689 - Rename CorePingDelegate. r=sebastian
We are doing more than just uploading in the delegate now.

I didn't fix this in the previous commits because version control makes this
non-trivial.

MozReview-Commit-ID: IjXsQC19k2S

--HG--
extra : rebase_source : 710fd827dd1468ca22c6372d101d3541040005ce
2016-05-31 15:39:58 -07:00
Michael Comella
e81040062d Bug 1273689 - Upload in onStop for first run. r=sebastian
MozReview-Commit-ID: 4UReiDeNCg4

--HG--
extra : rebase_source : f8b71109e5673c083b1f7d9d184f901998a40174
2016-05-31 15:32:41 -07:00
Michael Comella
9022a32d3c Bug 1273689 - Move session measurement calls to CorePingDelegate. r=sebastian
MozReview-Commit-ID: EPLUd5Uq0Pc

--HG--
extra : rebase_source : ad7f650414c15ac44b64acb371a04f3cfea3d0e2
2016-05-31 14:16:04 -07:00
Michael Comella
3013ee94dd Bug 1273689 - Factor out getSharedPreferences call. r=sebastian
The same preferences will be used by the new code & the old code.

MozReview-Commit-ID: BXuSQjhhXQq

--HG--
extra : rebase_source : 8824624c524392c0178535c47bf9657ba9cf9168
2016-05-31 14:07:26 -07:00
Michael Comella
0d36237547 Bug 1273689 - Elaborate on why we upload when we do. r=sebastian
MozReview-Commit-ID: DIxkY3F3Z6S

--HG--
extra : rebase_source : 0e13c316b6fc4a5522a52f75c5f00ffd54a7baab
2016-05-31 15:32:04 -07:00
Michael Comella
8bae604593 Bug 1273689 - Move core ping upload to BrowserAppDelegate. r=sebastian
This lets us put the two paths of upload code all in the same place.

MozReview-Commit-ID: BUsdyEAcdDO

--HG--
extra : rebase_source : a854facb606afd95764feac19fb5ef64f216addf
2016-05-31 13:57:44 -07:00
Andrzej Hunt
5e633581d1 Bug 1276050 - Remove duplicate code from Favicons r=sebastian
loadUncachedFavicon does exactly the same thing.

MozReview-Commit-ID: 58Yi28JZfv4

--HG--
extra : amend_source : 04776f9507d0b17432b4d74913ea20b84db5c012
2016-05-23 13:27:26 -07:00
Grigory Kruglov
218043cb63 Bug 1274029 - Part 5: Unit tests for aggregate updates r=sebastian
MozReview-Commit-ID: 9EljLhpySAj

--HG--
extra : rebase_source : ee29f463f14322e88672e49dce119e2ad3db5ec5
2016-06-01 10:21:14 -07:00
Grigory Kruglov
bdaf8e4677 Bug 1274029 - Part 4: Update aggregates during history import from android browser r=sebastian
MozReview-Commit-ID: EaR15lbuDQm

--HG--
extra : rebase_source : 4320fe191bd5bc1b8f02b254c711681ee3973c95
2016-06-01 12:38:51 -07:00
Grigory Kruglov
7023147d0d Bug 1274029 - Part 3: Update aggregates during syncing r=sebastian
MozReview-Commit-ID: 9WyBE0Lk3Tp

--HG--
extra : rebase_source : 8dd2af4cf71d810a94620a67734d6ca492574a76
2016-06-01 15:02:46 -07:00
Grigory Kruglov
3a506f704b Bug 1274029 - Part 2: Update aggregates during local browsing r=sebastian
MozReview-Commit-ID: 9Z9uFKxbRZm

--HG--
extra : rebase_source : 9e3f8d74dba70106650c886502cf6327cfbfa65d
2016-05-27 23:50:29 -07:00
Grigory Kruglov
e6c225c1e5 Bug 1274029 - Part 1: Database migration; initial aggregates calculation r=sebastian
MozReview-Commit-ID: 7nR2pwGV7nE

--HG--
extra : rebase_source : b91792560e9570d2032925d10f0597058a3a3882
2016-06-01 12:40:19 -07:00
Grigory Kruglov
c82fe23303 Bug 1274029 - Pre 2: Correct old comments about combined view r=grisha
MozReview-Commit-ID: IiePFWmkPKZ

--HG--
extra : rebase_source : 6f5fd3628823a567dcb9b8ee5324e9d3906461e3
2016-06-01 12:25:36 -07:00
Grigory Kruglov
78921a288e Bug 1274029 - Pre: Fix v32.db test db, set combined view to what it should be at this time r=sebastian
MozReview-Commit-ID: AgaxNgPHoJM

--HG--
extra : rebase_source : 40072f536b94ec593c20cda46fb7990bc02142bb
2016-05-30 18:16:49 -07:00
Sebastian Kaspari
6e4b1228f5 Bug 1276910 - Do not show "Add to home screen" prompt in private browsing. r=margaret
MozReview-Commit-ID: DFoMnyx4Gde

--HG--
extra : rebase_source : 4f91aea87e161fa08d07677f5c90717e7514e59c
extra : histedit_source : b8f02f27216478603d61c3f71562da74e0297e16
2016-06-01 10:02:51 +02:00
Carsten "Tomcat" Book
c2494b5883 merge mozilla-inbound to mozilla-central a=merge 2016-06-01 15:07:48 +02:00
Michael Comella
9912677a15 Bug 1277071 - Move PREF_SEQ_COUNT to CorePingBuilder. r=jonalmeida
MozReview-Commit-ID: 44R0ahE094N

--HG--
extra : rebase_source : a7283f8da674ea315f9fa0ac0dd59dead66f3e80
extra : source : e22b131d462f845529713d8a3e0612525d06b78c
2016-05-31 16:33:08 -07:00
Michael Comella
82181ad56b Bug 1270191 - Correct my previous patches to more faithfully reproduce the refactored code. r=liuche
The previous code checked:

if (env.startsWith("MOZ_DISABLE_SWITCHBOARD=")) {
    if (!env.endsWith("=")) {

So it would not pass with the empty String but my previous revision permitted
the empty string.

Practically speaking, I don't think it matters because this is only used in
remoteautomation.py where the value is 1, but better safe than sorry.

MozReview-Commit-ID: DLtmvWlQYs7

--HG--
extra : rebase_source : 3c96cf81f729911bfefcc103f46068bd9b8fb202
2016-05-31 17:25:17 -07:00
Michael Comella
1e85dedec9 Bug 1270191 - Disable telemetry upload during tests. r=grisha
MozReview-Commit-ID: GoQQRfGRvd4

--HG--
extra : rebase_source : c2d56638e078012766e8f7c9b64de6d3988e6dbc
2016-05-31 17:04:40 -07:00
Michael Comella
8fc95417b0 Bug 1270191 - Move Experiments to env var solution. r=grisha
MozReview-Commit-ID: 5Rpdyg7zpNG

--HG--
extra : rebase_source : 1642484993287d489060e95e3fbeb62232b422c6
2016-05-31 17:04:25 -07:00
Michael Comella
b50b3795da Bug 1270191 - Add IntentUtils.getEnvVarMap. r=grisha
MozReview-Commit-ID: 7ojczu4rOnD

--HG--
extra : rebase_source : f33965372fdfdb801d5f9b999c91dd591f6c856c
2016-05-31 16:48:03 -07:00
Chenxia Liu
a9a8e90f7c Bug 1276374 - Remove firstrun Content Notifications slide. r=ahunt
MozReview-Commit-ID: CIkvOZrqHwT

--HG--
extra : rebase_source : 9ed4662dd6b766536ecaef2e6e7b199d1d444cd3
2016-05-31 15:35:29 -07:00
Chenxia Liu
ca0df37914 Bug 1275782 - Disable "search-term" experiment. r=ahunt
MozReview-Commit-ID: FQY76x04Ilo
2016-05-31 15:49:51 -07:00
Kannan Vijayan
e4d6db6820 Bug 1272101 - Changes in preparation for FlyWeb landing. Add nsINetworkInfoService and implementation for various platforms. r=hurley 2016-06-01 16:16:40 -04:00
Carsten "Tomcat" Book
fbac2cff2c Merge mozilla-central to mozilla-inbound
--HG--
extra : rebase_source : 4d615ba5f76e2c989cc3f4d676d21105b67b25f0
2016-06-01 15:10:05 +02:00
Alastor Wu
5600b6dd28 Bug 1240423 - part6 : remove useless pref in Android. r=snorp
MozReview-Commit-ID: 8JFMZ5384wZ

--HG--
extra : rebase_source : 8d81b08eaac84181f63306a269f5e9c3478171b0
2016-06-01 10:26:24 +08:00
Alastor Wu
ae6fa1e22d Bug 1240423 - part1 : implement the remote media-control on Fennec. r=ahunt
MozReview-Commit-ID: GjkSCy5ecbQ

--HG--
extra : rebase_source : d0f3c81e5f42d556a19e3283b8b0dfdc0e3e7381
2016-06-01 10:26:01 +08:00
Francesco Lodolo (:flod)
acf7c3abc5 Bug 1277460 - Add localization comment for "Data saver" in android_strings.dtd. r=sebastian 2016-06-01 23:08:00 +02:00
Kit Cambridge
02d8a1e5d9 Bug 1265593 - Forward app server keys to Autopush on Android. r=nalexander
MozReview-Commit-ID: 3J4mM1k0pcY

--HG--
extra : rebase_source : c5a33f2f7043321307da17a6915dedfac66f1fc9
extra : histedit_source : 0357740fc62df416635c90a1ad075f6ee5e492e8
2016-03-22 12:09:31 -07:00
Alastor Wu
b76ee4b13b Bug 1257738 - part2 : modify logic of requesting audio focus in Android.
MozReview-Commit-ID: AG095CIgnA5
2016-06-01 10:21:58 +08:00
Alastor Wu
fa47d77e11 Bug 1257738 - part1 : implement the audio competing mechanism.
MozReview-Commit-ID: GZw7P0kbhOa
2016-06-01 10:21:13 +08:00
Wes Kocher
6e70ed1223 Merge m-c to inbound, a=merge 2016-05-31 17:18:54 -07:00
Wes Kocher
738f9c933b Backed out changeset d51737cf083d for android reftest failures 2016-05-31 16:05:58 -07:00
Michael Comella
94f6e41492 Bug 1243305 - Only share images whose src length is not too long. r=margaret
If the src is too long, we crash!

To test this, you can use my test page:
  https://people.mozilla.org/~mcomella/test/base64.html

An alternative approach would be to prevent users from sharing base64
images altogether because the experience is slightly jarring (since the
base64 string is copied to the application rather than the image).

MozReview-Commit-ID: AQeQ0Ff6ZMB

--HG--
extra : rebase_source : f265c9c474adaeaef9dd50bde5b9f80c6d5b0f53
2016-05-20 14:10:05 -07:00
Michael Kaply
b2516f1220 Bug 1272439 - Make distribution.searchplugins.defaultLocale work on Fennec. r=margaret 2016-05-31 13:04:35 -05:00
Michael Comella
8b44ee5388 Bug 1275880 - Correct action mode styling. r=liuche
MozReview-Commit-ID: H7up9G5vlcg

--HG--
extra : rebase_source : 6c881551c530b0ce90801bf272b8a3ab0f8b35f2
2016-05-27 12:49:55 -07:00
Michael Comella
c903ed153c Bug 1275880 - Give preferences action bar the correct config & delete unused. r=liuche
MozReview-Commit-ID: DavXaecwtux

--HG--
extra : rebase_source : 557a628bdf8fe3d67de7f703d406fd43d2d41c18
2016-05-26 10:28:33 -07:00
Michael Comella
898b428762 Bug 1275880 - Consolidate gecko preferences theme to one api level. r=liuche
MozReview-Commit-ID: BscET9LeUYM

--HG--
extra : rebase_source : 676b86bd3679c41e9cb464dd2964e2dfb8f73b72
2016-05-26 09:42:35 -07:00
Carsten "Tomcat" Book
6f2926b4e4 Backed out changeset ca182106b9e6 (bug 1264815) for bustage 2016-05-31 07:05:17 +02:00
Carsten "Tomcat" Book
a52403d289 Backed out changeset 20d0b05e708b (bug 1264815) 2016-05-31 07:05:01 +02:00