Michael Comella
ec8cfcfa94
Bug 1183659 - Update tab received notification copy. r=nalexander
...
The new format is:
$DeviceName
$url
If "$DeviceName" is not available, "$BrandName" (e.g. Firefox, Nightly) is
used.
Multiple received tab notifications are not aggregated.
--HG--
extra : commitid : APtf30beoHq
extra : rebase_source : 402c2b3ea16ba75e281e5e7d517d35f8aaf82d10
2015-11-04 12:27:20 -08:00
Chenxia Liu
56d558f371
Bug 1221113 - Put insecure-login-form doorhanger behind a flag. r=margaret
...
--HG--
extra : commitid : 7CMdM89A2ay
extra : rebase_source : e582f2d4c60bf1e672f153700825583baaf070c1
2015-11-04 16:06:58 -08:00
Michael Comella
dea6fd81fb
Bug 1214942 - Change action bar colors on 5+. r=sebastian
...
The Preferences Activity looks as desired.
We can't get the main activity to have the desired looks because bug 1220309
prevents us from changing the Action Bar back button color from white so we
went with the default style which looks *alright*.
--HG--
extra : commitid : BVhlBkKteVj
extra : rebase_source : 3bc50cb30f0010bf6cbb32b493f21ecce9a67557
2015-11-02 13:43:51 -08:00
Carsten "Tomcat" Book
0a34392a9e
Merge mozilla-central to fx-team
2015-11-05 12:17:28 +01:00
Carsten "Tomcat" Book
704588c507
merge fx-team to mozilla-central a=merge
2015-11-05 11:55:46 +01:00
Carsten "Tomcat" Book
90803a6363
Merge mozilla-central to b2g-inbound
2015-11-04 12:45:40 +01:00
Carsten "Tomcat" Book
3e11f2fe34
merge mozilla-inbound to mozilla-central a=merge
2015-11-04 11:59:46 +01:00
crazyprodigy
487c6f3f32
Bug 1216307 - Remove unused method hasOtherSyncClients. r=mcomella
...
--HG--
extra : commitid : 5FuDSqJugxB
extra : rebase_source : e716f6c45b7b16125ed7946993ecdb778afdf8d5
2015-11-03 04:28:18 -05:00
Daosheng Mu
c3d457b528
Bug 1215147 - Enable VR API's on FF for Android by default. r=snorp, r=vlad, r=bz
2015-11-04 01:59:00 +01:00
J. Ryan Stinnett
5d6812e289
Bug 1182722 - Move DevTools l10n files. r=ochameau,glandium,Pike,bgrins
...
Move DevTools l10n files under /devtools/client and /devtools/shared.
A script is attached to the bug for l10n repos to migrate their strings.
--HG--
rename : browser/locales/en-US/chrome/browser/devtools/VariablesView.dtd => devtools/client/locales/en-US/VariablesView.dtd
rename : browser/locales/en-US/chrome/browser/devtools/aboutdebugging.dtd => devtools/client/locales/en-US/aboutdebugging.dtd
rename : browser/locales/en-US/chrome/browser/devtools/aboutdebugging.properties => devtools/client/locales/en-US/aboutdebugging.properties
rename : browser/locales/en-US/chrome/browser/devtools/animationinspector.dtd => devtools/client/locales/en-US/animationinspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/animationinspector.properties => devtools/client/locales/en-US/animationinspector.properties
rename : browser/locales/en-US/chrome/browser/devtools/app-manager.properties => devtools/client/locales/en-US/app-manager.properties
rename : browser/locales/en-US/chrome/browser/devtools/appcacheutils.properties => devtools/client/locales/en-US/appcacheutils.properties
rename : browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd => devtools/client/locales/en-US/canvasdebugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties => devtools/client/locales/en-US/canvasdebugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd => devtools/client/locales/en-US/connection-screen.dtd
rename : browser/locales/en-US/chrome/browser/devtools/connection-screen.properties => devtools/client/locales/en-US/connection-screen.properties
rename : browser/locales/en-US/chrome/browser/devtools/debugger.dtd => devtools/client/locales/en-US/debugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/debugger.properties => devtools/client/locales/en-US/debugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/device.properties => devtools/client/locales/en-US/device.properties
rename : browser/locales/en-US/chrome/browser/devtools/eyedropper.properties => devtools/client/locales/en-US/eyedropper.properties
rename : browser/locales/en-US/chrome/browser/devtools/filterwidget.dtd => devtools/client/locales/en-US/filterwidget.dtd
rename : browser/locales/en-US/chrome/browser/devtools/filterwidget.properties => devtools/client/locales/en-US/filterwidget.properties
rename : browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd => devtools/client/locales/en-US/font-inspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/graphs.properties => devtools/client/locales/en-US/graphs.properties
rename : browser/locales/en-US/chrome/browser/devtools/har.properties => devtools/client/locales/en-US/har.properties
rename : browser/locales/en-US/chrome/browser/devtools/inspector.dtd => devtools/client/locales/en-US/inspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/inspector.properties => devtools/client/locales/en-US/inspector.properties
rename : browser/locales/en-US/chrome/browser/devtools/jsonview.properties => devtools/client/locales/en-US/jsonview.properties
rename : browser/locales/en-US/chrome/browser/devtools/layoutview.dtd => devtools/client/locales/en-US/layoutview.dtd
rename : browser/locales/en-US/chrome/browser/devtools/markers.properties => devtools/client/locales/en-US/markers.properties
rename : browser/locales/en-US/chrome/browser/devtools/memory.properties => devtools/client/locales/en-US/memory.properties
rename : browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd => devtools/client/locales/en-US/netmonitor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/netmonitor.properties => devtools/client/locales/en-US/netmonitor.properties
rename : browser/locales/en-US/chrome/browser/devtools/performance.dtd => devtools/client/locales/en-US/performance.dtd
rename : browser/locales/en-US/chrome/browser/devtools/performance.properties => devtools/client/locales/en-US/performance.properties
rename : browser/locales/en-US/chrome/browser/devtools/projecteditor.properties => devtools/client/locales/en-US/projecteditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/promisedebugger.dtd => devtools/client/locales/en-US/promisedebugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/promisedebugger.properties => devtools/client/locales/en-US/promisedebugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/responsiveUI.properties => devtools/client/locales/en-US/responsiveUI.properties
rename : browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd => devtools/client/locales/en-US/scratchpad.dtd
rename : browser/locales/en-US/chrome/browser/devtools/scratchpad.properties => devtools/client/locales/en-US/scratchpad.properties
rename : browser/locales/en-US/chrome/browser/devtools/shadereditor.dtd => devtools/client/locales/en-US/shadereditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/shadereditor.properties => devtools/client/locales/en-US/shadereditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/shared.properties => devtools/client/locales/en-US/shared.properties
rename : browser/locales/en-US/chrome/browser/devtools/sourceeditor.dtd => devtools/client/locales/en-US/sourceeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties => devtools/client/locales/en-US/sourceeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/storage.properties => devtools/client/locales/en-US/storage.properties
rename : browser/locales/en-US/chrome/browser/devtools/styleeditor.dtd => devtools/client/locales/en-US/styleeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/styleeditor.properties => devtools/client/locales/en-US/styleeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd => devtools/client/locales/en-US/styleinspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/tilt.properties => devtools/client/locales/en-US/tilt.properties
rename : browser/locales/en-US/chrome/browser/devtools/toolbox.dtd => devtools/client/locales/en-US/toolbox.dtd
rename : browser/locales/en-US/chrome/browser/devtools/toolbox.properties => devtools/client/locales/en-US/toolbox.properties
rename : browser/locales/en-US/chrome/browser/devtools/webConsole.dtd => devtools/client/locales/en-US/webConsole.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webaudioeditor.dtd => devtools/client/locales/en-US/webaudioeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webaudioeditor.properties => devtools/client/locales/en-US/webaudioeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/webconsole.properties => devtools/client/locales/en-US/webconsole.properties
rename : browser/locales/en-US/chrome/browser/devtools/webide.dtd => devtools/client/locales/en-US/webide.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webide.properties => devtools/client/locales/en-US/webide.properties
rename : toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd => devtools/shared/locales/en-US/csscoverage.dtd
rename : toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties => devtools/shared/locales/en-US/csscoverage.properties
rename : toolkit/locales/en-US/chrome/global/devtools/debugger.properties => devtools/shared/locales/en-US/debugger.properties
rename : toolkit/locales/en-US/chrome/global/devtools/gcli.properties => devtools/shared/locales/en-US/gcli.properties
rename : toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties => devtools/shared/locales/en-US/gclicommands.properties
rename : toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties => devtools/shared/locales/en-US/styleinspector.properties
extra : commitid : 8hcm3tr7AAi
2015-11-04 15:35:53 -06:00
Sergej Kravcenko
db0f60ba3d
Bug 1210534 - Search suggestions are not refreshed after single character entered into search field
...
--HG--
extra : commitid : KhoOIuIIc0U
extra : rebase_source : e7c0620c5c9016a765b3926fb512e362546c6cf2
2015-10-21 19:50:15 +03:00
Nick Alexander
6f0d9d66df
Bug 1220891 - Let web Firefox Accounts UI ride the trains. r=margaret
...
--HG--
extra : commitid : JR43EjRaHgd
extra : rebase_source : b3289317917297c2727db3121db99cfa319dbf3a
extra : histedit_source : 825ee4543ecb6e5527f435fa2868259ffbc5e635
2015-11-02 15:04:40 -08:00
Margaret Leibovic
dffa4fadcb
Bug 1216257 - Remove disabled tests and associated strings. r=gbrown
...
--HG--
extra : commitid : IAOCwhi4kl7
extra : rebase_source : 14d5e546816a65720c6eed818b6c9bc986b7bb0e
2015-10-23 19:03:33 -04:00
Margaret Leibovic
fdb97e5393
Bug 1216257 - Move settings items that don't belong elsewhere to "Advanced". r=sebastian
...
--HG--
extra : commitid : JodlP6Adn00
extra : rebase_source : ff60843ae82d358cf51dae8c4c956fb8f12a8ce0
2015-10-23 14:30:05 -04:00
Margaret Leibovic
d6b688d735
Bug 1216257 - Move data reporting prefs to "Privacy". r=sebastian
...
--HG--
extra : commitid : 5SamCjiZZwL
extra : rebase_source : dff29fe60093b5a0a4bf9de3ba1e6b810c017498
2015-10-23 13:49:42 -04:00
Margaret Leibovic
ae2e6285a6
Bug 1216257 - Rearrange privacy prefs to match spec. r=sebastian
...
--HG--
extra : commitid : Li0bHhI54uh
extra : rebase_source : c70f80da7a29012ca9468b3ed096ee371bdb5fc9
2015-10-23 13:43:00 -04:00
Margaret Leibovic
bd72a6ddb0
Bug 1216257 - Rearrange search settings to match spec. r=sebastian
...
--HG--
extra : commitid : ATsucXS0URg
extra : rebase_source : 2e37db9dcb8c73a634b512d59e2e31e57e177f8a
2015-10-23 13:35:09 -04:00
Margaret Leibovic
bb986dc7d1
Bug 1216257 - Move full-screen browsing pref to "General". r=sebastian
...
--HG--
extra : commitid : KP0SfaQqrm9
extra : rebase_source : 95712c79da10ef6bdf4df6f49388cccf997f9c9c
2015-10-23 13:22:06 -04:00
Margaret Leibovic
c9b6252af3
Bug 1216257 - Move titlebar pref to "General". r=sebastian
...
--HG--
extra : commitid : EcmICoojGAG
extra : rebase_source : 48f438779717a1b342b746aa317994e103f38194
2015-10-23 12:56:21 -04:00
Margaret Leibovic
c4550d3025
Bug 1216257 - Move tap-to-load images pref from to "Advanced". r=sebastian
...
--HG--
extra : commitid : Kkd69v2XbiI
extra : rebase_source : d0244cf9f8f1681c80baf1b24bd10a4cadcdc853
2015-10-23 12:40:38 -04:00
Margaret Leibovic
806ca2ca2e
Bug 1216257 - Move restore tabs pref from to "Advanced". r=sebastian
...
--HG--
extra : commitid : ELTMgv2y6Z6
extra : rebase_source : e1dd9c805e8d6add514d60c5e8b252e58c565c96
2015-10-23 12:26:33 -04:00
Margaret Leibovic
394390fdac
Bug 1216257 - Move clear private data setting to top level. r=sebastian
...
--HG--
extra : commitid : GbLRELSCVyd
extra : rebase_source : 8a9e5811a90d4c8c35ed13a67fe33532c9096b4c
2015-10-21 16:54:04 -04:00
Margaret Leibovic
547bebd081
Bug 1216257 - Move "Language" settting to "General" section r=rnewman
...
--HG--
extra : commitid : 1WLDwYGz0Xh
extra : rebase_source : d85f39aeb0ebf9137ad2d3a0b5f4fe95f46dc722
2015-10-21 16:33:06 -04:00
Margaret Leibovic
31f8f03122
Bug 1216257 - Rename "Developer Tools" category to "Advanced" r=sebastian
...
--HG--
rename : mobile/android/base/resources/xml/preferences_devtools.xml => mobile/android/base/resources/xml/preferences_advanced.xml
extra : commitid : I1TDuLqfzgf
extra : rebase_source : c4cca80c6e3663efb3095b439b01063e0e128122
2015-10-21 14:29:35 -04:00
Margaret Leibovic
234fd32eeb
Bug 1216257 - Rename "Display" category to "Accessibility" r=sebastian
...
--HG--
rename : mobile/android/base/resources/xml/preferences_display.xml => mobile/android/base/resources/xml/preferences_accessibility.xml
extra : commitid : CotJQcAlqN6
extra : rebase_source : ca8fb8c6c45dadf175fa483322637a5eb3f1026f
2015-10-21 14:11:31 -04:00
Margaret Leibovic
4226c657b3
Bug 1216257 - Move "Search" category to top level r=sebastian
...
--HG--
extra : commitid : FZYNXvhwc7C
extra : rebase_source : 0bfa19d370538ee565b29603f5d8f22838c4e741
2015-10-21 12:07:51 -04:00
Margaret Leibovic
928ed9eec2
Bug 1216257 - Rename "Customize" category to "General" r=sebastian
...
--HG--
rename : mobile/android/base/resources/xml-v11/preferences_customize.xml => mobile/android/base/resources/xml-v11/preferences_general.xml
rename : mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml => mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
rename : mobile/android/base/resources/xml/preferences_customize.xml => mobile/android/base/resources/xml/preferences_general.xml
rename : mobile/android/base/resources/xml/preferences_customize_tablet.xml => mobile/android/base/resources/xml/preferences_general_tablet.xml
extra : commitid : 7p8QMvlBKb6
extra : rebase_source : f59ba82a5ec034c1c4cfe4ea718225bad9ccff80
2015-10-21 10:57:15 -04:00
Michael Comella
03c5d71ab7
Bug 1215079 - Change gingerbread menu color to something readable. r=margaret
...
Each device can have different color font - this is a best guess about making
it readable everywhere.
--HG--
extra : commitid : 7pl4L3jJDjE
extra : rebase_source : 6d7ad3fb82b9968942698fee324096073f0653c5
2015-11-02 15:58:03 -08:00
Carsten "Tomcat" Book
d32b29a5b6
merge fx-team to mozilla-central a=merge
2015-11-03 11:59:08 +01:00
Wes Kocher
902cea2b9a
Merge m-c to fx-team, a=merge
...
--HG--
extra : commitid : 9dyZ3yocWTJ
2015-11-02 15:59:07 -08:00
Wes Kocher
d538c9e039
Merge m-c to b2ginbound, a=merge
...
--HG--
extra : commitid : cjuh9JhGcr
2015-11-02 15:58:27 -08:00
Fabrice Desré
d819fec749
Bug 1214554 - Implement getLocationListener on GeckoInterface r=reuben
2015-11-02 15:12:24 -08:00
Wes Kocher
5fc22c639b
Merge fx-team to central, a=merge
...
--HG--
extra : commitid : gBT26RNNX8
2015-11-02 14:26:35 -08:00
Fabrice Desré
3ebab267bd
Bug 1219032 - Rename B2GDroid to Firefox OS developer preview r=me
2015-11-02 09:54:21 -08:00
Phil Ringnalda
dd60c5be0a
Merge f-t to m-c, a=merge
2015-10-31 17:02:44 -07:00
Richard Newman
f24fea9d1a
Bug 643633 - Remove TTLs from form history records. r=markh,nalexander
...
--HG--
extra : commitid : HxQHAP2SacO
2015-10-30 22:19:56 -07:00
Michael Comella
7961821d7c
Bug 1220196 - Explicitly set AppCompatCheckBox in xml. r=sebastian
...
We don't extend AppCompatActivity in GeckoApp (bug 1220309
) so these
edge cases are not getting auto-inflated to their AppCompat
counterparts.
--HG--
extra : commitid : KGMyi1R3DvI
extra : rebase_source : 318ecad96502d1f5d4179b2842b874a3ffbdacb4
2015-10-30 15:24:58 -07:00
Michael Comella
1e05362cf3
Bug 1214939 - Explicitly use AppCompatCheckBox in PromptInput. r=sebastian
...
This way it inherits from the AppCompat styles like accentColor.
--HG--
extra : commitid : 82svRmJzzHk
extra : rebase_source : 376b4d6c533f47e737f90445c2d725e16096bf5b
2015-10-30 15:32:47 -07:00
Kartikaya Gupta
6b17c45094
Bug 1218386 - Truncate rather than round the touch coordinates sent by Android because if they get rounded up they might become invalid. r=snorp
...
--HG--
extra : commitid : D8Jh2c7gUhz
2015-11-02 12:18:58 -05:00
Michael Comella
f2f345b45d
Bug 1219950 - Remove special youtube intent handling code. r=rnewman
...
This code was originally added to request HTML5 video from Youtube under
certain conditions but Youtube serves HTML5 video by default and it is no
longer necessary.
--HG--
extra : commitid : CJ6XSBLmauW
extra : rebase_source : 122f7076c58dc3e2fda15cdc22d80c6b1053bd3b
2015-10-29 16:08:11 -07:00
Sebastian Kaspari
602a2efe4f
Bug 1182918 - Tab Queue: Add telemetry for double tap action. r=mfinkle
...
--HG--
extra : commitid : 9Ko5QGjYxza
extra : rebase_source : 103282f46af49b3210a2087128eb0949bc805d32
extra : amend_source : 8e5f2c32425f864f6a2e37d7ce6387a4432ea6d9
2015-10-27 10:47:03 +01:00
Ahmed Khalil
5998b85f98
Bug 1217581 - Crash when using Telemetry.addToHistogram after using Telemetry.addToKeyedHistogram, r=nalexander
2015-10-30 14:31:00 +01:00
Jim Chen
59740a97a0
Bug 1213888 - Block LayerView descendants from interfering with focus. r=kats
...
Using a hardware keyboard makes Android leave "touch mode", and when
leaving touch mode from a ViewGroup that prefers descendant
focusability, which is what a ScrollView is, Android will shift the
focus to the next available View, and cause our LayerView to lose focus.
The fix is to set the descendant focusability to blocking.
2015-10-30 08:30:00 +01:00
Wes Kocher
59aa271131
Merge m-c to inbound, a=merge
...
--HG--
rename : webapprt/application.ini.in => webapprt/webapprt.ini
extra : commitid : BR0bpNo1yny
2015-10-30 16:57:55 -07:00
Jim Chen
423789fdaa
Bug 1215163 - Add additional tests to testInputConnection; r=esawin
...
Add tests for setComposingRange and sendKeyEvent to testInputConnection.
2015-11-03 11:53:58 -05:00
Jim Chen
ed23d45bde
Bug 1216666 - Only send key events for single-character strings; r=esawin
...
GeckoEditable currently synthesizes key events when committing strings,
to improve web compatibility. However, synthesizing keys is causing
performance problems when the string is long. This patch limits key
synthesis to single-character strings. For longer strings, we commit the
string as a whole. We have other ways of ensuring web compatibility now
(sending dummy key events), so this restriction should not cause
regressions.
2015-11-03 11:53:58 -05:00
Jim Chen
244a51f96c
Bug 1216666 - Update composition as part of replacing text or changing span; r=esawin
...
Currently, GeckoEditable periodically fires update composition events to
update the Gecko composition styling. To make the code more efficient
and more robust in dealing with content JS code, this patch merges these
events into events like replacing text, setting span, and removing span.
As a result, a setComposingText call now results in one replacing text
event instead of a replacing text event plus an update composition event.
2015-11-03 11:53:58 -05:00
Jim Chen
5bd4b9906b
Bug 1216666 - Separate out Gecko selection from Java selection; r=esawin
...
Currently, the Gecko-side selection tries to mirror the Java-side
selection, but this is difficult because the Gecko selection has some
subtle but important behavior differences from the Java selection.
This patch separates out Gecko selection from Java selection so that
they're only loosely coupled. The two selections will periodically
synchronize through events and notifications, but at certain times they
may fall out-of-sync, for example when a composition is active. This
shouldn't affect functionality in a major way, and it's an acceptable
trade-off.
2015-11-03 11:53:57 -05:00
Ehsan Akhgari
91329749b1
Bug 1202085 - Part 2: Add an optional document argument to imgICache::FindEntryProperties(); r=seth
2015-10-30 16:03:09 -04:00
sgiles
0bcd7f502e
Bug 1219075 - Enable Android lockscreen for b2gdroid r=fabrice
2015-10-28 22:18:09 +00:00