Commit Graph

17646 Commits

Author SHA1 Message Date
Justin Inouye
d536f8c730 Bug 1196387 - Remove unneeded "reading time" code and layouts. r=sebastian 2015-08-28 01:31:00 +02:00
Sebastian Kaspari
e6743e5288 Bug 1203011 - Restricted profiles: Hide 'Remove' context menu item from Top Sites list. r=ally
--HG--
extra : commitid : BRlbpduV8IU
extra : rebase_source : d61b7567dd124abc0e738636dac6fd7a9b1fa0bd
extra : amend_source : 2ff2f7e7e100886e29e36e4683975cd1f9a5d91d
2015-09-16 12:35:48 +02:00
Mark Finkle
9a07104d95 Bug 1205878 - Update UI Telemetry document r=nalexander 2015-09-17 21:11:57 -04:00
vivek
6373021e54 Bug 1204565 - Selectively enable unit test based on build variant r=nalexander
DONTBUILD NPOTB

Project specific test filtering is automagically handled by gradle task graph

--HG--
extra : commitid : 2vx7QzGNVUI
extra : rebase_source : 63254386dca7f0aa5c6a5894f7915b2ed50dd65e
2015-09-15 00:55:49 +03:00
Nick Alexander
e6f667ae41 Bug 1205418 - Add "Manage account" link to Status Activity. r=vivek
This just directs to about:accounts?action=manage, which determines
the relevant URL and displays the web content.

Nota bene: about:accounts hasn't landed yet.

--HG--
extra : commitid : LCGuHdfDl9B
extra : rebase_source : 4a1ae71b6de0eec792a4a8eb499abf03d95d2c51
extra : histedit_source : 1fc484124924836a60c77cde487f5f039ad80d55
2015-09-10 16:36:29 -07:00
Sebastian Kaspari
a47d670131 Bug 1200665 - Restricted Profiles: Update SUMO title. r=margaret
--HG--
extra : commitid : 7pDqedr88kl
extra : rebase_source : 43060f2d4fade03f9e2f255083482d399e959086
extra : amend_source : ff4dfdf0bd0a48c4c5b5d4445fe112d294c0a31e
2015-09-17 10:04:52 +02:00
Carsten "Tomcat" Book
376f70e554 Merge mozilla-central to fx-team 2015-09-17 15:02:08 +02:00
Carsten "Tomcat" Book
9619696835 merge fx-team to mozilla-central a=merge 2015-09-17 14:42:06 +02:00
Richard Barnes
d1f14337d5 Bug 1204616 - Control Center should show full host name (w/ subdomains) in security block. r=MattN,liuche
--HG--
extra : commitid : CCWgbbWihKu
extra : rebase_source : 294f5ae1654926cad1c54ac72741a2ee7c2c9edd
2015-09-16 18:01:27 -07:00
Fabrice Desré
a7facfa4d7 Bug 1201184 - Enable OOP apps r=me 2015-09-16 09:24:17 -07:00
Wes Kocher
ebdcf9fc9e Merge b2ginbound to central, a=merge CLOSED TREE 2015-09-16 11:00:55 -07:00
Wes Kocher
5b879dacff Merge mozilla-inbound to m-c a=merge CLOSED TREE 2015-09-16 10:52:53 -07:00
Fabrice Desré
263dcda9c2 Bug 1205139 - Get @mozilla.org/embedcomp/prompt-service;1 to instantiate correctly r=dhylands 2015-09-15 23:09:43 -07:00
Fabrice Desré
5fa4266b64 Bug 1205099 - Package SettingsService r=dhylands 2015-09-15 17:39:00 -07:00
Wes Kocher
9c01eed3d4 Merge m-c to b2ginbound, a=merge 2015-09-15 17:20:50 -07:00
Allison Naaktgeboren
a4473dba45 Bug 1202196 Add UI Telemetry for search history items.r=mfinkle 2015-09-15 18:58:52 -07:00
Allison Naaktgeboren
fd277dc3ce Bug 1200319 - How many, which ones of which type of pills should be displayed on phones or tablets for search suggestions.r=mcomella 2015-09-15 18:58:52 -07:00
Sergej Kravcenko
52b391375c Bug 1186077 - Default favicon (globe) is briefly shown on about:home before updating to favicon. r=mcomella
--HG--
extra : commitid : G4BFIQ4TjMM
2015-09-15 17:28:37 -07:00
Fabrice Desré
82a61453c5 Bug 1202744 - Overlapping software home buttons r=snorp 2015-09-15 11:01:03 -07:00
Carsten "Tomcat" Book
6944c5ba30 merge mozilla-inbound to mozilla-central a=merge 2015-09-15 15:05:24 +02:00
Carsten "Tomcat" Book
0abaaa325f merge fx-team to mozilla-central a=merge 2015-09-15 14:59:25 +02:00
Sylvestre Ledru
454402606d Bug 1196373 - Remove useless empty line r=trivial 2015-09-16 11:45:28 +02:00
Sylvestre Ledru
8792cfc826 Bug 1196373 - Use the globally defined version instead of using the hardcoded value r=glandium
This will fix the display the beta number in the fennec about windows/support.
2015-09-16 11:43:07 +02:00
Nick Alexander
895de37da3 Bug 1191064 - Part 3: Handle removing Android Accounts from fxa-content-server. r=markh
This adds a new JS to Java ping-pong; exposes it via Accounts.jsm; and
uses it in response to the fxa-content-server message.

--HG--
extra : commitid : IghQHRrnuUs
extra : rebase_source : 5b255bb6da45abb41f4dfe00c559daaafe83a118
2015-09-14 17:21:19 -04:00
Nick Alexander
6535b7e95b Bug 1191064 - Part 2: Handle relinking Firefox Accounts on Fennec. r=markh
The desired behaviour:

* If we have no account now, and had no account or the same account in
  the past -- no message, allow.
* If we have no account now, but had a different account in the past -- prompt.
* If we have an account, and this is the same account -- no message, allow.
* If we have an account, and this is not the same account -- toast and
  never allow.

--HG--
extra : commitid : 9vegWtkMoYE
extra : rebase_source : 418f3e616185732c589c1097094260b1f7fbfee0
extra : amend_source : c67d36fa07f7de068998b40389b855c15571ebf3
2015-09-14 16:58:47 -04:00
Nick Alexander
87ec040f10 Bug 1191064 - Part 1: Add Fennec version of FxAccountsWebChannel. r=markh
This ticket does the following things:

* register early.  If the first page that Gecko loads is
  about:accounts, the channel needs to be in place.  If we delay this,
  we can and do miss content server messages.

* listen to the following messages:

  CAN_LINK_ACCOUNT: 'fxaccounts:can_link_account'
  CHANGE_PASSWORD: 'fxaccounts:change_password'
  DELETE_ACCOUNT: 'fxaccounts:delete_account'
  LOADED: 'fxaccounts:loaded'
  LOGIN: 'fxaccounts:login'

The list of messages is from
2a78a14daf/app/scripts/models/auth_brokers/fx-desktop-v2.js (L24)
via
2a78a14daf/app/scripts/models/auth_brokers/fx-fennec-v1.js

This patch implements only LOADED, LOGIN, and CHANGE_PASSWORD.  The
messages have the following behaviour:

A LOADED message is ferried to the individual XUL <browser> element it
originated from.  In general, WebChannel is a global listener: it does
not matter where a message originates.  We want to have fine-grained
control over when an embedding <iframe> is displayed (as opposed to
loaded, in the Gecko sense of loaded).  The fxa-content-server
participates in this exchange via the LOADED message; we complete the
loop by specially handling LOADED.

A LOGIN or CHANGE_PASSWORD message either creates a new Android
Account in the Engaged state, or moves an existing Android Account to
the Engaged state.  An Android sync is not yet requested -- we'll
arrange that from the Java side.

--HG--
extra : commitid : 1Cw78MNwRHq
extra : rebase_source : eedf8a1bccb5726f4a20d55c1d8496fbfb6c1ca0
2015-09-15 15:54:29 -04:00
Nathan Toone
bc36c933d1 Bug 1203800 - Allow for specifying the ANDROID_VERSION_CODE to use; r=nalexander
This patch allows you to set MOZ_APP_ANDROID_VERSION_CODE in a branding's configure.sh to specify the exact android:versionCode to use in the final (main) APK.  It does *not* modify the android:versionCode used in any other APKs.

--HG--
extra : transplant_source : U%F31E%1AK%3BY%18e.%E8%BD%F3_0%04%C6%84%7B
2015-09-11 16:05:56 -06:00
Anirudh S
cc08782363 Bug 1197874 - Remove MatchstickApp.jsm from the build. r=mfinkle 2015-09-10 20:04:50 +05:30
Eitan Isaacson
93caf7a23f Bug 1203697 - Add braille navigation. r=yzen r=mfinkle 2015-09-14 23:34:30 -07:00
Prabhjyot Singh Sodhi
d46b475756 bug 1186683 - *show* and *hide* BrowserSearch Fragment instead of creating each time to save memory. r=mcomella 2015-09-05 01:16:00 +02:00
Sebastian Kaspari
bf4a59e913 Bug 1199177 - Restricted profiles: Reset add-on preferences if restriction is not enabled. r=margaret
--HG--
extra : commitid : Ga8RI85TKrZ
extra : rebase_source : a56c82c2aa38f46e41e7ab428523671ec6b2a71b
2015-09-16 13:23:30 +02:00
Sebastian Kaspari
2f5fa23099 Bug 1200665 - Restricted profiles: Update SUMO URL. r=margaret
--HG--
extra : commitid : 2jXU59Q7wL1
extra : rebase_source : 2cc3355e5c175b50f5e2badc41ef2834f77c9585
2015-09-02 11:36:34 +02:00
Nick Alexander
250201219b Bug 1204937 - Part 4: Add "pass-through to web" versions of native account activities. r=sebastian
This always loads about:accounts with an 'action' query parameter.
This indirection allows Gecko to manage the fxa-content-server pref
independently of Java.

--HG--
rename : mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java => mobile/android/base/fxa/activities/FxAccountConfirmAccountActivityWeb.java
rename : mobile/android/base/fxa/activities/FxAccountFinishMigratingActivity.java => mobile/android/base/fxa/activities/FxAccountFinishMigratingActivityWeb.java
rename : mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java => mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivityWeb.java
extra : commitid : 4TMvCIutRhS
extra : rebase_source : ba8d8d0d4617b4ae85504468e458bdc0ff4990fe
2015-09-01 13:18:48 -07:00
Wes Kocher
f88d1a3d3d Merge m-c to fx-team, a=merge 2015-09-14 17:28:21 -07:00
Wes Kocher
29396aa40c Merge inbound to central, a=merge 2015-09-14 17:12:58 -07:00
vivek
4538813650 Bug 1182193 - Part 4: Disable unit test for regular gradle build tasks r=nalexander
--HG--
extra : commitid : I3RSwiXPTu6
extra : rebase_source : 2f7f0fd8be407b362fb24d7ed9b973904da39018
extra : histedit_source : 6098651b86b5cdb2f582699bba714fdf859972e8
2015-09-12 01:08:18 +03:00
Michael Comella
83e3adb69b Bug 1202247 - Use new menu asset in action bar & remove old assets. r=liuche
I wasn't able to test this on GB because I don't have a device with a soft menu
key, but I'm pretty sure that's because they don't exist.

--HG--
extra : commitid : 9zMCT5yxm9U
extra : rebase_source : 78ecf6d87a914640ae4e4e4d4cd12d37a52c2248
2015-09-10 11:46:23 -07:00
vivek
e14e6546fa Bug 1182193 - Part 3: Added runwith annotations for unittest with gradle r=nalexander
--HG--
extra : commitid : DprfZMdw881
extra : rebase_source : 7af703fa4574a8968f302f8e7f033937acf8c506
extra : histedit_source : 12517ec428dc5ea93b07e3194fde612bf62de356
2015-09-04 00:50:42 +03:00
vivek
e9b552a51c Bug 1182193 - Part 2: Copy the tests from android-sync project. r=nalexander
--HG--
extra : commitid : 2BXbag2woTI
extra : rebase_source : db757aa89583e3ec5db51da58ba92194653dca8f
extra : histedit_source : b1ffe400cd46bbe450a3b9df5b8c0974c0c75f33
2015-09-03 21:31:14 +03:00
vivek
9e19a7c3eb Bug 1182193 - Part 1: Add Gradle-based Robolectric JUnit 4 tests r=nalexander
--HG--
extra : commitid : 9Uf6P78K64R
extra : rebase_source : 64f84369ae718625e9c8a60f1507d49fd40bb123
extra : histedit_source : f3277962a15e98553a27401f10f605bced689ae2
2015-08-29 00:26:36 +03:00
Martyn Haigh
d3b9b2fd8f Bug 1201181 - Add &quot;Set a Homepage&quot; item in Settings &gt; Customize &gt; Home; r=mfinkle
--HG--
extra : commitid : JWKQqTwemxR
2015-09-14 14:36:38 +01:00
Martyn Haigh
eb5f28c49a Bug 1195721 - Set a home page; r=mfinkle
--HG--
extra : commitid : 7DqD1cuSyVt
extra : rebase_source : 2790a548b80b445ead955a0cea4a7b8898d87dd2
2015-09-14 14:21:14 +01:00
Martyn Haigh
11be52924c Bug 1200619 - Implement back button to mobile tabs tray; r=mcomella
--HG--
rename : mobile/android/base/resources/drawable-large-hdpi-v11/tabs_panel_nav_back.png => mobile/android/base/resources/drawable-hdpi/tabs_panel_nav_back.png
rename : mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_panel_nav_back.png => mobile/android/base/resources/drawable-xhdpi/tabs_panel_nav_back.png
rename : mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_panel_nav_back.png => mobile/android/base/resources/drawable-xxhdpi/tabs_panel_nav_back.png
extra : commitid : 8wLPMAHvhUz
extra : rebase_source : f74014cedf9571b39f63bb8a63dfb9e09e836848
extra : amend_source : 8f12104f729701903a3fd4f5f5a034b97f5be938
2015-09-11 15:22:46 +01:00
Justin Dolske
f1db2ce196 Bug 1198525 - Fix about:rights in Nightly and Developer edition, r=mossop, r=mfinkle
--HG--
extra : amend_source : e8f0ff258ccee6af9cfaa7c08b53e536c8dd60d4
extra : histedit_source : 869ec44df6552b3df6200d8b62b813da35f8acf3
2015-09-14 13:43:51 +05:30
Allison Naaktgeboren
499605e264 Bug 1203053 - Search icon appears blank until turning on search suggestions.r=mfinkle 2015-09-13 13:13:43 -07:00
Allison Naaktgeboren
fecf914058 Bug 1202583 - crash in java.lang.NullPointerException: Attempt to read from field ''java.lang.String org.mozilla.gecko.home.SearchEngine.name'' on a null object reference.r=mfinkle 2015-09-13 13:13:43 -07:00
Phil Ringnalda
44860262c7 Merge m-i to m-c, a=merge 2015-09-13 11:58:18 -07:00
Mark Finkle
d969e70542 Bug 1198009 - Add support to BrowserHealthRecorder for making a snapshot of active experiments in a new profile r=rnewman 2015-09-12 19:26:51 -04:00
Mark Finkle
e47686b542 Bug 1198009 - Add support to BrowserHealthRecorder for managing active experiment list into ProfileInformationCache r=rnewman 2015-09-12 19:26:45 -04:00
Mark Finkle
6ec81980d1 Bug 1198009 - Bump the ProfileInformationCache version r=rnewman 2015-09-12 19:26:39 -04:00