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

17375 Коммитов

Автор SHA1 Сообщение Дата
Carsten "Tomcat" Book 19fce95294 Merge mozilla-central to fx-team 2015-08-07 13:21:30 +02:00
Carsten "Tomcat" Book bfa6580a77 merge mozilla-inbound to mozilla-central a=merge 2015-08-07 13:13:06 +02:00
Chenxia Liu 2c2984b246 Bug 1185173 - Update toolbar icons for passive mixed content. r=margaret
--HG--
extra : commitid : 6lgbwZwVb0O
extra : rebase_source : dfae8e8577fb046603fbfea1032ee006a647eac8
2015-08-05 18:26:12 -07:00
Liang-Heng Chen 2458e4c039 Bug 1188935 - Part 1: enable NsdMulticastDNSManager only if API level >= 21. r=rnewman 2015-08-06 03:22:00 +02:00
Chenxia Liu 42079c5836 Bug 1185173 - Add support for Passive Mixed Content. r=margaret
--HG--
extra : commitid : Eynz8mvQTY1
extra : rebase_source : 939ea84b3ac99e6fe82938775482d484cb78c6d0
2015-08-05 18:10:24 -07:00
Wes Kocher 0b360fa181 Backed out changeset f48f05a347fc (bug 1038996) 2015-08-06 15:31:55 -07:00
Jonathan Almeida [:jonalmeida] 67a5c6184e Bug 1186529 - Add RecyclerViewClickSupport for click handling. r=sebastian
--HG--
extra : transplant_source : %F5%03%E7%0E%AB%9B%40%0C%A1%23%88%A41%E6M%E8%ED%3F%C3%14
2015-08-05 16:53:30 -07:00
Randall Barker a88b871ab4 Bug 1190988 - Hit testing appears to return incorrect positions when --enable-android-apz is specified. r=kats
The BrowserEventHandler was still being initialized when the C++ APZ is being
utilized which was causing event positions to be incorrectly converted in
certain cases.
2015-08-06 12:59:00 +02:00
Jonathan Almeida [:jonalmeida] 3919379c11 Bug 1038996 - Don't prepopulate the address bar with 'about:home', and 'about:privatebrowsing' on new tabs; they should be a placeholder. r=mcomella
--HG--
extra : amend_source : 9f930a1ade62ac767be9a6e217c73e57c4f53bb0
extra : transplant_source : %7C%A8%92%1A%5E%DF%87/%BB%E1%86%CA%CA%BC%B2%BB%91%C0%A4%00
2015-08-03 23:36:18 -07:00
Ahmed Khalil a85de48cf9 Bug 1180324 - Basic Fennec Sync health telemetry. r=liuche 2015-08-05 15:03:00 -04:00
Ryan VanderMeulen 6b37d9c465 Merge m-c to fx-team. a=merge 2015-08-06 15:53:46 -04:00
Ryan VanderMeulen bac91f37d2 Merge inbound to m-c. a=merge 2015-08-06 15:22:37 -04:00
Mark Capella a425371327 Bug 1189971 - Add primary UI preference to disable magnifying glass, r=blassey 2015-08-05 21:19:59 -04:00
Michael Comella 5b3fa94c8e Bug 1147265 - Backout changeset 81fd15f15c65.
--HG--
extra : commitid : GNyl7Wd388T
extra : rebase_source : 393419321c1b2fdbe33d102d9c1e35efd8f7ea05
2015-08-05 17:06:35 -07:00
Michael Comella 2ea836e630 Bug 1147265 - Backout changeset 6cf77a1ea12c.
--HG--
extra : commitid : 7yykhjbFNk
extra : rebase_source : aa551bb3165f784121487598bac50c9bc995e2f6
2015-08-05 17:06:10 -07:00
Michael Comella 3962b6e420 Bug 1147265 - Backout changeset 689cb91d014d.
--HG--
extra : commitid : BYCgu9Vm4tG
extra : rebase_source : a8d286a6ac37fe6fc554fdbacc5d6f70b37efeaf
2015-08-05 17:05:30 -07:00
Michael Comella c911bafcba Bug 1147265 - Backout changeset bb1d0caafe6e.
--HG--
extra : commitid : 1GGvtgtSGjB
extra : rebase_source : b41e1eb9aaaa34f61b1e8173476cd275264a23c6
2015-08-05 17:05:06 -07:00
Margaret Leibovic 1200210aec Bug 1189453 - Update loadUrlInTab to load the URL in the same private context as its parent tab. r=liuche
--HG--
extra : commitid : KAFhv39MkDz
extra : rebase_source : a7e1b43fee87466da2e04e316cbaf28e73561a9a
2015-08-04 16:24:43 -04:00
Sebastian Kaspari 339bd01012 Bug 1183069 - Copy removed fields from android.provider.Browser to LegacyBrowserProvider. r=rnewman
--HG--
extra : commitid : 7qIFuCxppoX
extra : rebase_source : 89dc929577cfe329436a90f1cb51a3209a1983d7
extra : amend_source : be84917784335f86412bb873d11a162bdaa673fa
2015-08-03 17:04:27 +02:00
Sebastian Kaspari 4873e328c5 Bug 1189414 - Restricted Profiles: Clean up missing and unneeded restrictions. r=ally
* Synchronize nsIParentalControlsService.idl and Restriction.java
* Do not hide 'tools' menu but menu items of disabled features
* Hiding 'Report site issue' should not be configurable
* Restricted profiles: DISALLOW_INSTALL_APPS is a system restriction and should not be configurable
* RestrictedProfileConfiguration: Use AboutPages

--HG--
extra : commitid : 8DTKY8nESVS
extra : rebase_source : b0f91e9d578fbeea6093a1f6af9ffa645daa6d2a
2015-08-06 10:51:45 +02:00
Mark Capella f3a5fca399 Bug 1191161 - p3 - Rename / Shorten WrapElementForJNI to WrapForJNI, r=jchen
--HG--
rename : mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java => mobile/android/base/annotation/WrapForJNI.java
2015-08-07 02:09:08 -04:00
Martyn Haigh f46358bcc3 Bug 1186278 - Regression: Some doorhangers have round-corner-looking artifacts; r=sebastian
--HG--
extra : commitid : FqOBLlpZdcm
extra : rebase_source : 92b65649abd52598e74777afbef09727db6fca4c
2015-08-05 15:34:21 +01:00
Martyn Haigh bf3b67755b Bug 1188951 - Let tab queues ride the trains; r=sebastian
--HG--
extra : commitid : 6nnEBy9RBtl
extra : rebase_source : a2328809a0349e76c4d90b6f244d94b32f91323b
2015-08-05 17:27:50 +01:00
Carsten "Tomcat" Book b998607785 Merge mozilla-central to fx-team 2015-08-05 13:36:41 +02:00
Carsten "Tomcat" Book 592d83d1f5 merge mozilla-inbound to mozilla-central a=merge 2015-08-05 13:12:59 +02:00
vivek 3d2dc59165 Bug 1055264 - Fixed profile image update after sync now r=nalexander
--HG--
extra : commitid : AUR8B4UYuON
extra : rebase_source : d8d54b861530cdd4fa725408018d5963417a8532
extra : amend_source : a3927870a9746ba92b1e2bfe5ca3633fdc2de94e
2015-08-05 00:47:08 +03:00
Sebastian Kaspari bb0cd238e4 Bug 1190597 - isRestrictedProfile() should check app and user restrictions. r=ally
--HG--
extra : commitid : HsY1QUVvLJG
extra : rebase_source : 2097a66b886d1009d60b6437c0b502932992d7fb
extra : amend_source : 5d57ad455e527e3783f7368f59ce47d6158dbddc
2015-08-04 20:27:49 +02:00
Wes Kocher 83a7cbf448 Merge m-c to inbound, a=merge 2015-08-06 18:11:16 -07:00
Ehsan Akhgari 861692c320 Bug 1018504 - Rename the events used after bug 1190082 2015-08-04 21:20:25 -04:00
Geoff Brown 134c995c5d Bug 1184186 - Convert robocop testWebChannel to mochitest-chrome; r=nalexander 2015-08-06 07:27:48 -06:00
Geoff Brown 9f155071bc Bug 1184186 - Convert robocop testVideoDiscovery to mochitest-chrome; r=mfinkle 2015-08-06 07:27:48 -06:00
Geoff Brown c00d94dbf4 Bug 1184186 - Convert robocop testSimpleDiscovery to mochitest-chrome; r=mfinkle 2015-08-06 07:27:48 -06:00
Geoff Brown 05c65e5fbf Bug 1184186 - Convert robocop testSharedPreferences to mochitest-chrome; r=nalexander 2015-08-06 07:27:48 -06:00
Geoff Brown d1e519c530 Bug 1184186 - Convert robocop testSessionFormData to mochitest-chrome; r=mfinkle 2015-08-06 07:27:48 -06:00
Geoff Brown 795518a80c Bug 1184186 - Convert robocop testRestrictedProfiles to mochitest-chrome; r=mfinkle 2015-08-06 07:27:47 -06:00
Geoff Brown b30d582660 Bug 1184186 - Convert robocop testReaderView to mochitest-chrome; r=margaret 2015-08-06 07:27:47 -06:00
Geoff Brown 567856510b Bug 1184186 - Convert robocop testOfflinePage to mochitest-chrome; r=mfinkle 2015-08-06 07:27:47 -06:00
Geoff Brown 11e1eab85a Bug 1184186 - Convert robocop testNetworkManager to mochitest-chrome; r=mfinkle 2015-08-06 07:27:47 -06:00
Geoff Brown 210dbe66f4 Bug 1184186 - Convert robocop testMigrateUI to mochitest-chrome; r=margaret 2015-08-06 07:27:47 -06:00
Geoff Brown bd7b8ae053 Bug 1184186 - Convert robocop testJNI to mochitest-chrome; r=nalexander 2015-08-06 07:27:47 -06:00
Geoff Brown 75d8d2ebc9 Bug 1184186 - Convert robocop testJavaAddons to mochitest-chrome; r=nalexander 2015-08-06 07:27:47 -06:00
Geoff Brown 4a3307ac9d Bug 1184186 - Convert robocop testHomeProvider to mochitest-chrome; r=margaret 2015-08-06 07:27:47 -06:00
Carsten "Tomcat" Book ba03e3c181 Backed out 2 changesets (bug 1016555, bug 1189427) for making Android 4.3 API11+ debug X3 perma fail in test_ev_certs.js
Backed out changeset ebd4e3880403 (bug 1189427)
Backed out changeset 331e489c7534 (bug 1016555)
2015-08-06 11:51:27 +02:00
Gijs Kruitbosch 127aeefe17 Bug 1182778, r=margaret,f=bz
--HG--
extra : commitid : ATLsconKiIq
extra : rebase_source : 4e6c3207ce438c4429dc32695dcbc4fbf5a2c022
2015-07-17 13:30:42 +01:00
Sebastian Kaspari 752f0c6e63 Bug 1190982 - Restricted Profiles: Fix key of DISALLOW_IMPORT_SETTINGS restriction. r=ally
--HG--
extra : commitid : IaP1ATNTB9D
extra : rebase_source : 00737d77476115196fb05eadb74589bb55722ca0
extra : amend_source : 37deaf53654011cd95538b9e2670818dec474d6f
2015-08-04 20:14:16 +02:00
Mark Capella 81c2c280e9 Bug 1191161 - p2 - Remove OptionalGeneratedParameter, which no longer has any meaning, r=jchen 2015-08-06 01:55:29 -04:00
Mark Capella a715087aff Bug 1191161 - p1 - Merge WrapEntireClassForJNI into WrapElementForJNI, r=jchen 2015-08-06 01:55:29 -04:00
Margaret Leibovic 7e5cfa466d Bug 1132591 - Unpin shortcut tabs when navigating to a new host. r=mcomella
--HG--
extra : commitid : 9YghmSCOxop
extra : rebase_source : ee33ba044d4b102b2d3b1dea01427f9ab6e08bd2
2015-07-16 11:01:03 -07:00
Nick Alexander 3788437b16 Bug 1190940 - Handle MOZ_NATIVE_DEVICES and MOZ_WEBRTC in Gradle build. r=sebastian
This is an information sharing review request.  This patch
demonstrates two ways to handle static build flags in the Java source
base.

For MOZ_NATIVE_DEVICES, we /exclude/ certain Java source files.  This
is unwieldy but works fine.

For MOZ_WEBRTC, we selectively /include/ certain Javas source
directories.  We symlink the directories into the objdir so that the
IntelliJ configuration remains entirely under the project directory --
IJ really doesn't like it when sources are outside of the project
content root.  Since two source directories declare the same package
(org.webrtc.videoengine) we can't symlink deep in the package
hierarchy.  Therefore, we add top-level source directories sibling to
src/main.

--HG--
extra : commitid : 2huDQAbl5NJ
extra : rebase_source : 8171c7e6944722d6d2f772ea9fae710eb2ecaec4
2015-08-04 10:01:26 -07:00
Jonathan Almeida [:jonalmeida] 10cd0eb56a Bug 1184211 - Replace TwoWayView in SearchBar with RecyclerView. r=sebastian
- Also includes changes from bug 1158291 applied on top of the re-written view.

CLOSED TREE

--HG--
extra : amend_source : 51b075ef494ac192230c49910caed1a87749e3e7
2015-07-22 21:06:33 -07:00
Carsten "Tomcat" Book 57a966656a merge mozilla-inbound to mozilla-central a=merge 2015-08-04 13:01:07 +02:00
Chenxia Liu 36fcd19a2d Backout bug 1185173 for accidental landing. r=bustage DONTBUILD
--HG--
extra : commitid : ruW5wmDxF6
2015-08-03 18:34:58 -07:00
Chenxia Liu a59a9d6068 Backed out 2d12d2f2f450 (bug 1138560) for duplication. r=dupe DONTBUILD
--HG--
extra : commitid : 7k3vHdv0raU
extra : amend_source : 1bfa744ed79b747dd3af042272e09d58275e6891
2015-08-03 18:30:52 -07:00
Chenxia Liu fed7edd114 Bug 1185173 - Add support for Passive Mixed Content. r=margaret
--HG--
extra : commitid : 5pM7lIYdkly
extra : rebase_source : b20c1847af7bab94762f1e2e12a2fae9a6082d41
2015-07-23 16:10:36 -07:00
Margaret Leibovic 3cd18c8604 Bug 1018504 - (Part 2) Mute/unmute tab when tapping audio indicator. r=mhaigh
--HG--
extra : commitid : 9syZVptHbWT
extra : rebase_source : c1aa172d72e2e023056bc2038cba2d2cc725c810
2015-07-31 11:32:46 -07:00
Margaret Leibovic f74e42789d Bug 1018504 - (Part 1) Add indicator to show which tab is playing sound. r=mhaigh
--HG--
extra : commitid : 6uFyuLLyATu
extra : rebase_source : 532f6adc6d2d123f2df4ea0ecda652542a8a7c31
2015-07-31 11:08:26 -07:00
Nikhil Marathe 970731b146 Bug 1153499 - Enable push and sw prefs. r=dougt,ehsan
--HG--
extra : commitid : GQaiqrErWLz
extra : rebase_source : 3f01566803616b221b883b51ab079d8868e8e502
extra : source : 06a05093fc417449b9458fa88105e863acddef8d
2015-07-15 13:12:44 -07:00
Wes Kocher de08e9e79c Merge m-c to inbound, a=merge 2015-08-05 16:47:52 -07:00
Richard Barnes dea6d4077f Bug 1016555 - Disable OCSP checking for certificates covered by OneCRL 2015-08-05 17:26:40 -04:00
Jim Chen ca25fd4683 Bug 1189818 - Remove jsconsole-clhandler and nsDefaultCLH in Fennec; r=mfinkle
Fennec doesn't use jsconsole-clhandler or nsDefaultCLH because it has
its own CLH, BrowserCLH.js, but they do take up a small but measurable
amount of time on startup.
2015-08-04 17:47:28 -04:00
Jim Chen 11d1c03111 Bug 1187552 - Make NativeJSContainer use direct ownership model; r=snorp
Make NativeJSContainer/NativeJSObject Java objects own their
corresponding C++ objects directly, to reduce an extra
allocation/deallocation for each object and to simplify code.
2015-08-04 17:47:28 -04:00
Jim Chen 7706596d62 Bug 1186467 - Make NativeJSContainer and NativeJSObject extend JNIObject; r=snorp
JNIObject is the base class for any class that wish to use per-instance
native methods. It encapsulates the long native pointer that used to be
in NativeJSContainer.
2015-08-04 17:47:28 -04:00
Jan-Ivar Bruaroey 0ccb51ddc8 Bug 1175523 - Update most (but not all) tests to use elem.srcObject over .mozSrcObject. r=pehrsons
--HG--
extra : rebase_source : bac0027f4bf5d75b8730c44a10141c114002633b
2015-07-14 10:12:31 -04:00
Geoff Brown 9608ca1de3 Bug 1184186 - Convert robocop testDeviceSearchEngine to mochitest-chrome; r=mfinkle 2015-08-03 12:00:55 -06:00
Geoff Brown f3517986d5 Bug 1184186 - Convert robocop testDesktopUserAgent to mochitest-chrome; r=mfinkle 2015-08-03 12:00:55 -06:00
Geoff Brown a7126d74a6 Bug 1184186 - Convert robocop testDebuggerServer to mochitest-chrome; r=jryans 2015-08-03 12:00:55 -06:00
Geoff Brown 7214023fcf Bug 1184186 - Convert robocop testAndroidLog to mochitest-chrome; r=myk 2015-08-03 12:00:55 -06:00
Geoff Brown 4286569056 Bug 1184186 - Convert robocop testAccounts to mochitest-chrome; r=rnewman 2015-08-03 12:00:55 -06:00
Geoff Brown b0eb7577bf Bug 1184186 - Convert robocop testResourceSubstitutions to mochitest-chrome; r=nalexander 2015-08-03 12:00:55 -06:00
Geoff Brown e2c11b08fe Bug 1184186 - Convert robocop testAboutLogins to mochitest-chrome; r=ally 2015-08-03 09:28:35 -06:00
Geoff Brown d628391e18 Bug 1184186 - Convert robocop testAppConstants to mochitest-chrome; r=nalexander 2015-08-03 09:28:33 -06:00
Geoff Brown dde99300fe Bug 1184186 - Add a mochitest-chrome manifest for Android; r=nalexander 2015-08-03 09:28:32 -06:00
Carsten "Tomcat" Book 6b441cd90a merge mozilla-inbound to mozilla-central a=merge 2015-08-03 13:56:39 +02:00
Kartikaya Gupta 59b72bd9f4 Bug 1189879 - Don't use a CSS viewport height of 480 in desktop mode; compute it from the screen aspect ratio. r=snorp 2015-07-31 16:07:35 -04:00
Ryan VanderMeulen 7dc3f4954e Merge m-c to inbound. a=merge
CLOSED TREE
2015-07-31 15:05:02 -04:00
Karim Benhmida 51b801345e Bug 1188145 - Add Telemetry for Voice input. r=liuche
--HG--
extra : transplant_source : %5Co%F8%608%E6%F5%3ES%BC%0E%C5%B7%F9%BC%8F%CCJO%7F
2015-07-29 15:26:10 -07:00
Karim Benhmida 63560435e6 Bug 1188146 - Add Telemetry for QR code input. r=liuche
--HG--
extra : transplant_source : %88%93%EA%5B%88%BFkN%CC6%84C%ED%8B%C4%2C%5B%BCB%0A
2015-07-29 15:29:57 -07:00
dominique vincent 45c7a6aa25 Bug 1184937 - Hide cycling zoom button and set a default level of zoom in config. r=mcomella 2015-07-31 08:42:50 +02:00
Sebastian Kaspari 44c14baf93 Bug 1125977 - Restricted profiles: Hide setting to set master password. r=ally
--HG--
extra : commitid : 20fbuH5Hyzs
extra : rebase_source : bafc4e8840ae8f53ee36be0937530459a6e71ae0
2015-07-31 10:19:46 +02:00
Sebastian Kaspari 83eed0f628 Bug 1125979 - Restricted profiles: Hide Settings > Privacy > Clear private data. r=ally
--HG--
extra : commitid : 2nl5bcmBIo6
extra : rebase_source : 4a040a7deb330f901a97f8eef7c86d46fc29ce38
2015-07-31 10:18:59 +02:00
Sebastian Kaspari 2592d93a06 Bug 1189233 - Restricted profiles: Block access to about:config. r=ally
--HG--
extra : commitid : 2ZnTCRM53w2
extra : amend_source : 9f12278df5598a9789bd0199b0b1ffa51f879eac
2015-07-31 10:16:50 +02:00
Sebastian Kaspari cf8a9f962f Bug 1188905 - Restricted profiles: Prevent clearing history. r=margaret
--HG--
extra : commitid : 5UXciGuiA05
extra : rebase_source : 246fed443e3d45efd9127a71f69f0e2254db0ebe
2015-07-31 09:59:01 +02:00
Sebastian Kaspari 46be8d30e9 Bug 1184094 - testRestrictions: No restrictions should be enforced when using a normal profile. r=margaret
--HG--
extra : commitid : 1a33HBRndFg
extra : amend_source : 81204c83d132f941044834367b27da03fb6e4014
2015-07-31 09:49:04 +02:00
Sebastian Kaspari 58e78a3578 Bug 1125975 - Restricted profiles: Hide display settings. r=margaret
--HG--
extra : commitid : 97BeGRE6Zj3
extra : rebase_source : de8a3119fb6519d9addb35b1164f76aa963575ad
2015-07-31 09:45:40 +02:00
Allison Naaktgeboren a34fb08ce2 Bug 1183234 - Telemetry probe for usage of about:logins UI interactions.r,p=vladan 2015-07-30 13:36:51 -07:00
Allison Naaktgeboren bd17f298fa Bug 1180795 - KidFox: Disable first-run screen for restricted profile.r=sebastian 2015-07-30 13:02:10 -07:00
Kartikaya Gupta bd57be7daa Bug 1127901 follow-up - Fix a comment. r=me 2015-07-31 13:08:14 -04:00
Kartikaya Gupta 61494b26bd Bug 1189921 - Get rid of the overscroll color in LayerRenderer. r=mfinkle 2015-08-01 00:03:22 -04:00
Wes Kocher 3df52d9ecd Merge m-c to fx-team, a=merge 2015-07-31 17:15:43 -07:00
Allison Naaktgeboren 9533687fbc Bug 1189447 - No default bookmarks in Kidfox.r=sebastian 2015-07-31 16:19:38 -07:00
Allison Naaktgeboren 649781b097 Bug 1185780 - disable save if you delete the entire password in about:logins.r=liuche 2015-07-31 16:17:00 -07:00
Mark Capella 576ec5e5b3 Bug 1188741 - Text selection action bar not appearing, r=kats 2015-07-31 17:25:29 -04:00
Chenxia Liu 1e670272fa Bug 1189089 - Update Tracking Protection icon to grey stripe, not white. r=mhaigh
--HG--
extra : commitid : 5VQXpWxXnca
extra : rebase_source : 76e651389fde5d27be51152bb8e16fdb3e702a19
2015-07-30 16:52:24 -07:00
Chenxia Liu 7f88785dd8 Bug 1187107 - Add "Learn more" link about Mixed Content to Site Identity doorhanger. r=mhaigh
--HG--
extra : commitid : HL6BYHUa8LG
extra : rebase_source : a4756e2f0cedf4b270da2365c0128377ab48f49b
2015-07-30 18:44:06 -07:00
Michael Comella b916886a4e Bug 1189585 - Change SearchEngineBar to use the DrawableUtil class. r=sebastian
--HG--
extra : commitid : Azeh6bAK8qa
extra : rebase_source : fb334d71e39e3ad3e06f1c0bc3f05f947888ba85
2015-07-30 18:41:13 -07:00
Michael Comella a434eb2d77 Bug 1189585 - Add DrawableUtil class. r=sebastian
This includes a method to tint drawables.

--HG--
extra : commitid : DbqlZdnw4ZH
extra : rebase_source : 75133c6aa6add290ce62432daaca0a33a145f0a2
2015-07-30 19:16:41 -07:00
Michael Comella f709cd9f13 Bug 1175532 - Only add CATEGORY_BROWSABLE to intent & android-app uris. r=margaret
This patch is originally from bug 1182328 and r+'d there.

--HG--
extra : commitid : IqJshUI635a
extra : rebase_source : 33ccf13fafcc9d73a1ae1144d5b34eaf44c181b2
extra : source : 86e571eafb2fc942c7e36e1b842c98a4e3c5b46b
2015-07-10 16:42:00 -07:00
Michael Comella 5339ae3bc9 Bug 1175532 - Use Intent.parseUri for intent:// & android-app://. r=margaret
We now specify no flags to Intent.parseUri so it can accept and parse arbitrary
URIs.

This patch is originally from bug 1182328 and r+'d there.

--HG--
extra : commitid : iZzNuK1lTR
extra : rebase_source : 73112ac5561c5312282c2490b9ac81a6a29d93ca
extra : source : b9ac6d0b5f4c8116f1ecf490141468a4a47ffd27
2015-07-10 16:40:00 -07:00
Allison Naaktgeboren ee1f7d2d9a Bug 1187059 - change the header to use light font weight on about:logins.r=liuche 2015-07-30 11:56:49 -07:00
Michael Comella 219be0cbf1 Bug 1187538 - Wrap tab tray thumbnails in TabThumbnailWrapper and add id. r=mhaigh
I don't have a device to screen cast to test this makes state_recording work in
*_tabs_item_cell, but following the code, the bits to turn state_recording on
or off are in place in TabsListLayout and presumably working for tabs_item_row,
so it should automatically work for tabs_item_cell, and the same bits are in
TabsGridLayout so this should presumably work for new_tablet_tabs_item_cell.

I verified the changes do not cause crashing or a difference in appearance.

--HG--
extra : commitid : 6UL2Wf814Ax
extra : rebase_source : 184c48b2f5d8aa866bca1c472caabfda8d5a2223
2015-07-28 11:58:25 -07:00
Michael Comella b96edf057a Bug 1188557 - Update ThemedView template to import the correct LWT. r=mhaigh
I believe I just used an IDE to update the files last time, meaning the
template never got updated.

This was originally implemented but no longer used in bug 1177611.

--HG--
extra : commitid : 6Wp4qTCjyTk
extra : rebase_source : 215f9eef9e203a4e2cbf26051204c6b25bdf3779
extra : source : 14e9ba975f55242c773420d77143717acf7f8456
2015-07-24 17:09:35 -07:00
Sebastian Kaspari 208eda38c4 Bug 1125309 - Restricted profiles: Hide all Location Services features and related UI. r=margaret
--HG--
extra : commitid : 42c8GrRQAla
extra : amend_source : b3babc754a9bce1d26fcde235ed2d88aae431d1d
2015-07-30 20:18:03 +02:00
Sebastian Kaspari a750930a71 Bug 1125283 - Restricted profiles: Disable snippets (promotional banner) support. r=margaret
--HG--
extra : commitid : L9P2X923tuL
extra : amend_source : fd89d8944fc4e0a6c7aa73becdacd5a4934eddfa
2015-07-30 20:12:58 +02:00
Sebastian Kaspari 17fae17791 Bug 1125293 - Restricted profiles: Check global restrictions in isAllowed(). r=ally
This effectively hides all sync features and related UI for restricted profiles
because this is controlled by the DISALLOW_MODIFY_ACCOUNTS restriction of the
system.

--HG--
extra : commitid : 3wHdNQwo3u3
extra : amend_source : 97a9936ddddd30d3da16801675b65837addcae70
2015-07-30 20:00:16 +02:00
Sebastian Kaspari 2b86ebbaeb Bug 1125290 - Hide private browsing support and all related UI. r=margaret
--HG--
extra : commitid : 2LWSL6EAKjQ
extra : amend_source : fef3505c7afebef412827a3bbc99ca92166d97da
2015-07-30 19:55:18 +02:00
Sebastian Kaspari fd4e2c2e8c Bug 1125315 - Restricted profiles: Hide setting "Customize > Home". r=ally
--HG--
extra : commitid : DYDNNfg9MCz
extra : amend_source : c0bf203ca0e6f01fc1bf2081bddd933e736bc88e
2015-07-30 19:52:54 +02:00
Sebastian Kaspari f5fdc72920 Bug 1125288 - Restricted profiles: Hide all developer tools and related UI. r=margaret
--HG--
extra : commitid : 3IGiZUnPlf4
extra : amend_source : 2b8f787cd6b45a941097f8e183561039c8e8a61c
2015-07-30 19:48:38 +02:00
Sebastian Kaspari d7f1de6d04 Bug 1187260 - Simplify RestrictedProfiles class. r=ally
This patch transforms RestrictedProfiles to delegate isAllowed() and
canLoadUrl() calls to an object implementing the RestrictionConfiguration
interface.

DefaultConfiguration, GuestProfileConfiguration and
RestrictedProfileConfiguration are implementing RestrictionConfiguration
and will take care of handling the restrictions for the different types
of profiles.

--HG--
extra : commitid : LQ2YsdyG6oR
extra : rebase_source : 015f7f02c6e7fded16d3811a71f0ae23547e5f71
2015-07-24 19:47:31 +02:00
vivek 9f7a7b0482 Bug 1181284 - Enable swipe to refresh on remote panel list based on scroll position r=mcomella.
--HG--
extra : rebase_source : 008f67dcdc563ea510f53ac26f58d49fb4bceaa1
extra : amend_source : 56eee0b512c970401b4be81953d6c63da2c34348
extra : histedit_source : 39a020e816e28b3786d3be084750f3df7223a2a2
2015-07-29 23:08:38 +03:00
Sebastian Kaspari f4aea2e31e Bug 1187278 - Adjust tabContentStart for "scrollable tabs" on phones. r=mhaigh
--HG--
extra : commitid : KO3q4vghhpO
extra : rebase_source : 3c5379041bf775926fd50112c344e309e8cdb298
extra : amend_source : 2912682c1253280bebd1dab7cb5222a84e3a04a4
2015-07-28 19:20:02 +02:00
Ryan VanderMeulen ee5201bc8f Merge m-c to fx-team. a=merge 2015-08-03 15:04:31 -04:00
Michael Comella 9311929b7b Bug 1189944 - Annotate DrawableUtil method. r=sebastian
This *just works* with Gradle. :)

--HG--
extra : commitid : JQa6hrJM1QV
extra : rebase_source : ac0d143fc16a3b225a54412169d3c886832bc5ae
2015-07-31 14:34:44 -07:00
Martyn Haigh 7c50e01340 Bug 1187984 - Update about:privatebrowsing to include information about TP; r=liuche
--HG--
extra : commitid : 4rzcE5psRjn
extra : rebase_source : e4798ca421c5ab039a95a898743e7e59805e17dc
2015-07-31 14:04:46 +01:00
Wes Kocher 19cf04fb40 Merge m-c to fx-team, a=merge 2015-07-29 20:22:12 -07:00
Wes Kocher 10301118e8 Merge inbound to central, a=merge 2015-07-29 18:12:11 -07:00
Mark Finkle 517cb01e92 Bug 1188609 - Remove mirroring support from RokuApp (Android) r=margaret 2015-07-29 16:09:29 -04:00
Chenxia Liu 9d6f8b582d Bug 1177576 - Update padding. r=margaret
--HG--
extra : commitid : LA4c0UivM4o
extra : rebase_source : 2b3f6ea7d437924828be6d83f5981ec2df630939
2015-07-23 19:31:11 -07:00
Chenxia Liu e14a6d3e9f Bug 1177576 - Update styling for Owner text. r=ally
--HG--
extra : commitid : 9732xpWZWOV
extra : rebase_source : 081234d3401a3982e4744c9eb0f91abe562d8dab
2015-07-21 18:28:48 -07:00
Chenxia Liu 358872f8b1 Bug 1177576 - Update icons for different Mixed Content Blocking states. r=margaret
--HG--
rename : mobile/android/base/resources/drawable-hdpi/lock_identified.png => mobile/android/base/resources/drawable-hdpi/lock_secure.png
rename : mobile/android/base/resources/drawable-xhdpi/lock_identified.png => mobile/android/base/resources/drawable-xhdpi/lock_secure.png
rename : mobile/android/base/resources/drawable-xxhdpi/lock_identified.png => mobile/android/base/resources/drawable-xxhdpi/lock_secure.png
extra : commitid : J12cFSFgibk
extra : rebase_source : a1903f4c1a54d704fd30490574689304ba34f851
2015-07-21 18:10:32 -07:00
Ryan VanderMeulen e61fe71db0 Merge fx-team to m-c. a=merge 2015-07-29 13:55:46 -04:00
Ryan VanderMeulen 0cdb86e630 Merge fx-team to m-c. a=merge 2015-07-29 13:49:24 -04:00
Chenxia Liu 38d871aea6 Bug 1186260 - Favicon in site info doorhanger is too large when using default favicon. r=margaret
--HG--
extra : commitid : 5Vv8CgE3XTE
extra : rebase_source : d3b4fbb8e6fecde0f4f9d67ab6e0bc66698bce1d
extra : amend_source : c3739697caf0c0fd711ea355c28a9869d4c31c40
2015-07-22 14:45:45 -07:00
Sebastian Kaspari 527af74b4b Bug 1186841 - TabMenuStrip: Draw divider all the way. r=margaret
--HG--
extra : commitid : 6dytiVId1Ta
extra : rebase_source : bc1bde5cd1b336f6eabc44a1bf1972b8e62b1e95
2015-07-23 12:58:03 +02:00
Sebastian Kaspari 563cdc918b Bug 1125289 - Restricted profiles: Disallow browsing about:addons. r=margaret
--HG--
extra : commitid : GQvyhHTw9QA
2015-07-28 14:20:51 +02:00
Giovanny Andres Gongora Granada 6869f90b29 Bug 1183902 - _shareStringWithDefault is unused. r=mcomella
--HG--
extra : commitid : BktCoT1lbEv
2015-07-29 00:43:37 -07:00
Mantaroh Yoshinaga 8f6bd9c43d Bug 1139211 - Add element disabled check for datalist. r=wesj,margaret
--HG--
extra : commitid : 5XLY0QwHJwx
extra : rebase_source : a12e8a81b634c95fdd3af907d2f1c701ff30591a
2015-07-28 23:15:50 -07:00
Mark Capella 9140fbf240 Bug 1174922 - NativeZip does not null-terminate zip entry comparisons correctly, r=nchen 2015-07-29 01:03:26 -04:00
Chenxia Liu 433d14eaa4 Bug 1188042 - Update tracking protection strings. r=mhaigh
--HG--
extra : commitid : 1wZGIRISz4Q
extra : rebase_source : a4b470c52d4c27f4f7709c41b56da05a749f1684
2015-07-27 17:01:36 -07:00
vivek 074d27e765 Bug 1182270 - Pre: AccountPickler public interface synchronized to avoid race condition r=nalexander.
--HG--
extra : commitid : KT2pXglowza
extra : rebase_source : 3e6d86bd674bad411be428e7ffcb3e483de684fe
extra : amend_source : e0900f039707f0c61f65335a76c284862e0d8d78
2015-07-16 00:24:37 +03:00
dominique vincent 547f3b2147 Bug 1184912 - Close zoomed view on tab change. r=mcomella 2015-07-28 00:20:58 +02:00
Sebastian Kaspari 6813eb81dc Bug 1125289 - (Part 1) Disallow installing add-ons and apps. r=ally
--HG--
extra : commitid : 5zoHBdWuIBZ
extra : amend_source : be62bbe20f60ff68a0a0f722811d3e7ca5346a12
2015-07-28 13:40:37 +02:00
Sebastian Kaspari f32de0b471 Bug 1180653 - Restricted Profiles: Make restrictions configurable by device admin. r=ally
--HG--
extra : commitid : 3006T16MH2q
extra : rebase_source : 505df8913d531008a4ffb7b9d357f176575db630
extra : amend_source : 56addaead8e868b9b9c852fc4f1bff418fc9fe80
2015-07-09 19:38:19 +02:00
Allison Naaktgeboren f7a7203ee8 Bug 11833193 add telemetry probe in about:logins for load time of getAllLogins() in the wild.r=mfinkle, p=vladan 2015-07-27 16:11:33 -07:00
Ryan VanderMeulen 01499c3bc0 Merge inbound to m-c. a=merge 2015-07-27 15:34:42 -04:00
Michael Comella bb93dc0a08 Bug 1184708 - Set progress view private mode when visibility is changed. r=mhaigh
--HG--
extra : commitid : 3sKUoV4mMv5
extra : rebase_source : bc3441730e49930a4d744a0ca07b47e8caeccccb
2015-07-22 19:03:47 -07:00
Jim Chen 7ec24cf6cd Bug 1186530 - Add support for instance native pointers; r=snorp
Introduce a JNIObject class that serves as a base class for classes
that wish to use per-instance native methods. JNIObject includes a long
native pointer field that the C++ code accesses to associate the Java
object instance with a C++ object instance.
2015-07-29 15:11:15 -04:00
Jim Chen 372ad94b3e Bug 1182641 - Use new autogenerated native methods for ANRReporter; r=snorp 2015-07-29 15:11:14 -04:00
Richard Barnes 01417659c4 Bug 958886 - Use HTTPS for amazon.com searches from the search box 2015-07-27 11:43:12 -04:00
Panos Astithas 398e652b24 Bug 1145503 - TP exceptions added while in Private Browsing mode persist beyond the Private Browsing session. r=ehsan 2015-07-26 13:23:12 +03:00
Wes Kocher 8f5503c1c0 Merge m-c to fx-team, a=merge 2015-07-24 13:48:31 -07:00
Wes Kocher a2d43dcb47 Merge fx-team to central, a=merge 2015-07-24 13:42:45 -07:00
Qiang Lu b3eee8c12c Bug 1178069 - Check devices capability before enable use of vp8 hardware acceleration using android.media.MediaCodecList and android.media.MediaCodecInfo r=jrmuizel
--HG--
extra : amend_source : f7d209e2dd0bdb9a67c563b5bd2d51da4af56ba8
extra : histedit_source : d8226f7240c5d19d9d2f08f9fc07a83e158505a2%2Cde0d48144261c643fcb23c0f7756906aeded1708
2015-07-24 12:45:55 -07:00
Karim Benhmida e19b5fd278 Bug 1182220 - QR Code reader should only support ZXing barcode scanner. r=liuche
--HG--
extra : source : b8620e871139266feb7b0a10134d79947f7733a7
2015-07-21 14:07:22 -07:00
Chenxia Liu 8dc2cb7c17 Bug 1187428 - Update usage of strings. r=trivial
--HG--
extra : commitid : 83Y5keffcek
extra : amend_source : e78ddcf701958378eed0beaf2c5e65c378f03882
2015-07-24 12:04:31 -07:00
Chenxia Liu 332209ee0d Bug 1187428 - Follow-up: Update string name for changed about:logins resource. r=trivial
--HG--
extra : commitid : 7J8SpvZE1lF
extra : amend_source : 76a763a74b2d71bffa63335bad814c1a7f90bece
2015-07-24 12:00:38 -07:00
Michael Comella 7bddb7c2e1 Bug 1170724 - Only update search engine bar when necessary. r=sebastian
We were updating the search engine bar every time the view was created, which
is inefficient because we already have a default state which we laid out and
drew. Since there were no search engines at the time, the search engine bar
would be hidden and another layout and draw would occur. Finally, when the
search engines arrived asynchronously from Gecko, we'd lay out and draw the
search engine bar (again). Obviously, this had had some perf implications.

Instead, now we only update the search engine bar if we explicitly choose not
to update the search engines (in onResume), or when the search engine data
arrives. The default state is to draw the empty search engine bar (including
magnifying glass label), to avoid a layout. We could use INVISIBLE, but then
the initial list of non-search engine results will look misplaced.

When the no search engines are returned (i.e. the user deletes them all), the
empty search engine bar will be briefly shown before hiding.

Once gecko is loaded on my N4, the search engines are received so quickly, the
empty search engine bar flicker only makes a minimal impression, no different
from the search engines appearing asynchronously. The best way to improve this
is probably to cache the search engines in Java (bug 1186703).

--HG--
extra : commitid : 844C8XDnQbi
extra : rebase_source : 07cd7eb2330a591320a398c667172b226acbe408
2015-07-22 16:40:50 -07:00
Karim Benhmida 0d040db318 Bug 1186653 - QR code input setting item test. r=liuche
--HG--
extra : commitid : 9LtSPFJZWhc
extra : rebase_source : 687f58896ce5f76fd5a449e92156d42989a999dd
2015-07-22 15:07:10 -07:00
Karim Benhmida 15adba3488 Bug 1178503 - Remove nightly-only flag for QR code input. r=liuche
--HG--
extra : commitid : EMVHezunff4
extra : rebase_source : 69b9c0e6631f09239426dfc483922d7069ab53f2
2015-07-21 13:23:57 -07:00
Sebastian Kaspari 549bd2bd55 Bug 1183559 - Hide "Import from Android" feature on devices running Android M+. r=rnewman
This patch assumes that Android M is going to be API level 23 (very likely) and additionally
checks for Android M Preview builds (Build.VERSION.RELEASE set to "M").

--HG--
extra : commitid : Bt1sQw4h4rC
extra : rebase_source : f2d4c0c062b41c67db9a6819665734621c0b2229
2015-07-24 14:04:30 +02:00
Carsten "Tomcat" Book 0f9616aba4 Merge mozilla-central to mozilla-inbound 2015-07-24 12:58:18 +02:00
Olli Pettay 3c61547e30 Bug 1180382, update display port after, not before Gecko has scrolled the page to the #hashtag, r=kats 2015-07-23 19:23:49 +03:00
Karim Benhmida bd94cd295f Bug 1178500 - Remove nightly-only flag for voice input. r=liuche
--HG--
extra : transplant_source : %40%8F%98Z%E4z%26%B3z%25%F2%3B%D7%0Ah%E6%B5Z%B7%D0
2015-07-21 13:16:46 -07:00
Karim Benhmida 5fe4685be6 Bug 1132918 - Unrecognized words on direct voice input will display two error notifications. r=liuche
--HG--
extra : transplant_source : %8D%12%18%CFWE%04%97PgO%5Bw%28-%06%B5%27%DB%E9
2015-07-20 18:22:00 -07:00
Martyn Haigh 0feee1d1a8 Bug 1161638 - Remove the chrome at the bottom of the screen in the Tabs Tray; r=sebastian
I'm not planning on landing this just yet, it's part of a bigger piece of work which I can't pref off, so I'm going to get the majority of it going through review before anything lands properly.

--HG--
extra : commitid : 27WoVKnsjXW
extra : rebase_source : 9f15da3170b46b75835dd88a2cc25cb56a84215a
extra : amend_source : 2a14b885dbb0bf289d1900101cc837f348bcf86e
2015-06-11 14:12:24 +01:00
dominique vincent 827f1cc53c Bug 1184762 - Check visibility before closing with animation. r=mcomella 2015-07-22 12:03:36 +02:00
Michael Comella 022bcd7498 Bug 1162372 - Load about:neterror when we can't load a uri w/ a custom scheme. r=margaret 2015-07-21 14:41:37 -07:00
Giovanny Andres Gongora Granada 9c98de4eee Bug 1165136 - Remove `public` keywords from ChangeVerifier interface. r=mcomella 2015-07-22 20:44:00 +02:00
Garvan Keeley de6c7cae04 Bug 1171213 - Remove Context.MODE_MULTI_PROCESS on prefs, it is no longer used. r=sebastian 2015-08-12 13:01:09 -04:00
Vladimir Vukicevic a55a1c1deb Bug 1186608, [webvr] Add individual prefs to disable backends, set sane defaults; r=mstange 2015-04-12 23:05:36 -04:00
Wes Kocher b26b131604 Merge m-c to inbound, a=merge 2015-07-28 18:03:34 -07:00
Ehsan Akhgari c7235a9138 Bug 1188158 follow-up: Use the correct variable name
Landed on a CLOSED TREE to fix the build bustage.
2015-07-28 15:42:36 -04:00
Ehsan Akhgari 736bd7b4ce Bug 1188158 - Move nsIPrivateBrowsingTrackingProtectionWhitelist to its own component in toolkit; r=jdm
--HG--
rename : toolkit/components/url-classifier/nsURLClassifier.manifest => toolkit/components/privatebrowsing/PrivateBrowsing.manifest
rename : toolkit/components/url-classifier/PrivateBrowsingTrackingProtectionWhitelist.js => toolkit/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js
rename : toolkit/components/url-classifier/moz.build => toolkit/components/privatebrowsing/moz.build
rename : toolkit/components/url-classifier/nsIPrivateBrowsingTrackingProtectionWhitelist.idl => toolkit/components/privatebrowsing/nsIPrivateBrowsingTrackingProtectionWhitelist.idl
2015-07-28 15:01:05 -04:00
Carsten "Tomcat" Book abf3d4db0a Merge mozilla-central to fx-team 2015-07-23 13:46:50 +02:00
Mark Capella 45016e2981 Bug 1165556 - Implement do_register_cleanup() methods, r=margaret 2015-07-23 06:56:13 -04:00
Mark Capella f0561a254a Bug 1165556 - Remove _execute_test() methods, r=margaret 2015-07-23 06:56:13 -04:00
Mark Capella 16a06fec62 Bug 1165556 - Remove run_test_in_child() methods, r=margaret 2015-07-23 06:56:13 -04:00
Mark Capella 1cac9b51b0 Bug 1165556 - Stub do_register_cleanup() methods, r=margaret 2015-07-23 06:56:13 -04:00
Carsten "Tomcat" Book 52ef4c4dfb merge mozilla-inbound to mozilla-central a=merge 2015-07-23 12:02:27 +02:00
Kartikaya Gupta 7b9f833a48 Bug 1186004 - Add a pref to enable/disable APZ zooming behaviour. r=botond 2015-07-22 23:42:08 -04:00
Melchiorre Alastra 75ec0a7b32 Bug 1116349 - Flush Picasso LRU cache on memory pressure events
--HG--
extra : commitid : Bh67XGQspL
2015-07-22 18:00:07 -07:00
Wes Kocher 728d2a2aa2 Backed out changeset a6bf83d92196 (bug 1101746) for build bustage 2015-07-22 15:47:43 -07:00
Allison Naaktgeboren 2534d0cb16 Bug 1101746 - Display message when no passwords are present.r=mfinkle,p=vladan 2015-07-22 15:36:19 -07:00
Allison Naaktgeboren d1eeace105 Bug 1155345 - UI affordance during loading of list items in about:passwords.r=liuche 2015-07-22 15:22:42 -07:00
Nick Rosbrook 16fcc49043 Bug 1122977 - Make the share overlay's MAXIMUM_INLINE_ELEMENTS fetch its value from resources, instead of being fixed at 2. r=rnewman
--HG--
extra : commitid : JyxkGzqzkgV
2015-07-16 20:53:53 -04:00
Sebastian Kaspari bc93298683 Bug 1184683 - GeckoPreferences: Pass current context to RestrictedProfiles instead of relying on GeckoAppShell. r=ally
--HG--
extra : commitid : F7fZLb8kJ05
extra : rebase_source : c7e207292f41b2b5b532241727aebf38e467253d
2015-07-20 11:55:32 +02:00
Amogh Pradeep afe5941352 Bug 1169421 - Switch Fennec to use ch.boye instead of org.apache.http to allow for building with Android M SDK 23. r=mfinkle 2015-06-20 01:13:47 -05:00
Richard Newman e14ce5547c Bug 1130066 - Be careful about environment changes during early or failed BrowserHealthRecorder init. r=mcomella
--HG--
extra : commitid : 2Xtz8qWkrZb
2015-07-21 13:26:34 -07:00
Wes Kocher 4ca6e3d7e5 Backed out changeset 32d62d7b2060 (bug 1130066) for android build bustage CLOSED TREE 2015-07-21 14:32:25 -07:00
Florian Quèze af1f363e26 Bug 1186174 - Enable region specific search defaults for all Fennec users, r=mfinkle. 2015-07-21 23:12:04 +02:00
Richard Newman ed84104432 Bug 1130066 - Be careful about environment changes during early or failed BrowserHealthRecorder init. r=mcomella
--HG--
extra : commitid : 8adUOMlVMj4
2015-07-21 13:26:34 -07:00
Sebastian Kaspari 9528e9b595 Bug 1158291 - Show ability to scroll search engine bar by cutting off last icon. r=mcomella
--HG--
extra : commitid : GpUOSRE5Ow0
extra : rebase_source : 4eba3254d88d972e7bb79d3a084a0ba4be1a9437
2015-07-18 14:08:21 +02:00
Sebastian Kaspari 91fc8bf56d Bug 1073053 - Use "scrollable tabs" for panels navigation. r=mhaigh
--HG--
extra : commitid : I2tTSdLexgI
extra : rebase_source : e754b4e6e8375f5940a7fec95f7b7380ad4ddc22
2015-07-16 20:36:42 +02:00
Joel Maher beaefa9976 Bug 1176579 - Create a clone of testCheck2.java that points to an autophone friendly url. r=bc 2015-07-13 04:05:00 -04:00
Margaret Leibovic c83a43f2ff Bug 1183643 - Add a testcase to make sure the Tracking Protection UI doesn't show up in a normal tab. r=liuche
--HG--
extra : commitid : b6VJtfnlzF
extra : rebase_source : 8bb1c0fb1b1e5e9c686ce9d0150ea82087af8b26
extra : histedit_source : 936023e48845e7241154178a12f460fa1f9fb706
2015-07-17 15:32:32 -07:00
Martyn Haigh 69fd3d9a0c Bug 1180975 - UI for re-enabling tracking protection no longer shown (Private Browsing); r=liuche
--HG--
extra : commitid : Gvn214pz7mn
extra : rebase_source : b3e537106a72883425dec5b5f7031d247b8e3cd2
extra : histedit_source : b546f56132a72cbf1a129c11eaf4478586dc4f8c
2015-07-14 12:04:50 +01:00
Mark Capella 676d753676 Bug 1158925 - Move ok() and is() into robocop_head.js, r=margaret 2015-07-20 19:12:06 -04:00
Michael Comella f9010caa2c Bug 1147265 - Add filterTouches... in remaining main FF activities. r=mhaigh
GeckoPreferences inherits from GeckoPreferencesBase which inherits from
GeckoBase, avoiding Gecko, where we put the last filterTouches... so it needs
its own filterTouches... TabQueueActivity is addressed and all other activities
inherit from Gecko.

--HG--
extra : commitid : 80SwXNyYp7E
extra : rebase_source : 17e234d1c78c73a841014fa459acbc114990fee7
2015-07-14 15:27:41 -07:00
Michael Comella d35bf8e63f Bug 1147265 - Move TabQueueActivity theme to themes.xml. r=mhaigh
--HG--
extra : commitid : ANlaWeHSNbO
extra : rebase_source : 6dd2b6b091991ff8ff1818415b49db4a53f408fb
2015-07-14 15:26:48 -07:00
Michael Comella 42eb6e5a05 Bug 1147265 - Add filterTouches... to sync activities. r=mhaigh
All old sync activities inherit from SyncTheme, which inherits from Gecko on
API < 11 and Gecko.Dialog -> GeckoBaseDialog on v11+.

All fxaccount activities inherit from FxAccountTheme, which inherits from
Gecko.

Note that I don't have an old sync account so I did not test that behavior.

--HG--
extra : commitid : DVKwxCuJytk
extra : rebase_source : a3760c72f1659bc2c146e84e1e405aa80047b6a0
2015-07-14 15:07:12 -07:00
Michael Comella e5dbb73b19 Bug 1147265 - Add filterTouches... to application theme. r=mhaigh
This will affect any activities that do not inherit a theme, which is currently
none of them.

Note that this may affect default inheritance (e.g. we'll no longer inherit
from Holo, if it's the default) but I haven't done the research. To fix it,
you'd have to make the FilteredTouches theme inherit from the default theme
(which could be different for each API level).

--HG--
extra : commitid : CLE7hcQ5sz0
extra : rebase_source : 8665f99c755a4c4f4e30216fd97db61551be19a4
2015-07-14 14:55:14 -07:00
Mike Taylor 46ac153906 Bug 1185196 - Android US overrides: Remove trailing comma so we have valid JSON. r=rnewman
--HG--
extra : commitid : 4b7QrdEc10H
2015-07-19 23:43:49 -07:00
Sebastian Kaspari bd15cae9f7 Bug 1125316 - Restricted profiles: Hide setting "Customize > Import from Android". r=ally
--HG--
extra : commitid : LAOujSwJzQH
extra : rebase_source : 2164658000390c61332366f22887e13025a4aebe
2015-07-18 12:41:24 +02:00
Mike Taylor 86990a3463 Bug 1177298. Add UA overrides for top Japan sites. r=Sebastian
--HG--
extra : commitid : KFkExvl7clE
2015-07-17 10:20:00 -07:00
Wes Kocher 05f0e864f0 Merge m-c to fx-team, a=merge CLOSED TREE 2015-07-17 18:09:12 -07:00
Mike Taylor eb7b4d36eb Bug 1184320. Add UA override to remove Android version for Gmail. r=Sebastian
--HG--
extra : commitid : JxVLLj77J1a
2015-07-17 12:12:00 -07:00
Ryan VanderMeulen a33e05c88c Merge inbound to m-c. a=merge 2015-07-17 10:26:22 -04:00
Margaret Leibovic e55ee1bc4e Bug 1183115 - Remove apps AboutRedirector contract from MobileComponents.manifest. r=mcomella
--HG--
extra : commitid : HbbXn10lMWT
extra : rebase_source : a228d96294fa6f967669811efa5c07d4b939defc
2015-07-15 17:16:26 -07:00
Mark Finkle c9baf340c8 Bug 1183724 - Add more complete telemetry coverage of GeckoApp startup actions r=margaret 2015-07-16 17:41:47 -04:00
Andrea Marchesini 2c5578cbc4 Bug 1177399 - Enable AudioChannelService in desktop by default. r=ehsan 2015-07-13 17:27:50 +01:00
Mike Taylor 9a46de08cb Bug 1184268 - Flip useragent.updates.enabled pref to true. r=margaret 2015-07-15 12:55:00 -04:00