Commit Graph

7831 Commits

Author SHA1 Message Date
Jim Chen
51b031ffd0 Bug 945521 - Make sure button text type is consistent with keyboard text type; r=mcomella 2013-12-20 17:48:59 -05:00
Mark Finkle
977c311988 Bug 952473 - SessionStore should only watch for top-level pageshow events r=wesj 2013-12-20 16:41:11 -05:00
Tim Taubert
10b26b16ea merge m-c to elm 2013-12-20 15:05:28 +01:00
Carsten "Tomcat" Book
369d47d00e Backed out changeset 70befb4cf2f4 (bug 878935) for mochitest -4 and bc test failures 2013-12-20 12:42:54 +01:00
Carsten "Tomcat" Book
ac8e72b838 Backed out changeset b84baa03b9d1 (bug 868341) for mochitest -4 and bc testfailures 2013-12-20 12:42:16 +01:00
Tim Taubert
4be4a6b411 merge m-c to elm 2013-12-19 15:52:32 +01:00
Carsten "Tomcat" Book
86a8ff528e merge fx-team to mozilla-central 2013-12-19 10:33:37 +01:00
Wes Kocher
27882a0c96 Merge inbound to m-c 2013-12-18 20:49:25 -08:00
Nick Alexander
03c3ebeefc Bug 951883 - Part 2: Remove temporary compile time guards. r=me
--HG--
extra : rebase_source : 51325eeea8fc1d5b2e7cd84e8977072b030496c8
2013-12-18 15:13:26 -08:00
Nick Alexander
f3e1df9bbf Bug 951883 - Part 1: Revert name of BrowserProvider. r=me
--HG--
extra : rebase_source : 554a609e6b114e1ac490a4d0136cb1b9d74e68fa
2013-12-18 14:45:38 -08:00
Margaret Leibovic
d20f8b65c7 Bug 951605 - Fix identified/verified image reversal. r=mfinkle 2013-12-18 11:39:18 -08:00
Margaret Leibovic
7dca54dd0a Bug 948894 - Fix typos. r=me 2013-12-18 13:52:21 -08:00
Richard Newman
b7e3b5e1a2 Bug 938153 - Selectively display the globe favicon placeholder when favicon fetches take long enough to be noticeable. r=mfinkle 2013-12-18 11:37:41 -08:00
Sriram Ramasubramanian
4eacb610fb Bug 940997: Remove icons from main menu. [r=mfinkle] 2013-12-18 18:49:53 -08:00
Sriram Ramasubramanian
1afde7867d Bug 940997: Support showAsAction "ifRoom" in custom menu. [r=mfinkle] 2013-12-18 18:49:48 -08:00
Sriram Ramasubramanian
1e4e22d217 Bug 940997: Reorganize primary controls in main menu. [r=mfinkle] 2013-12-18 18:46:42 -08:00
Ryan VanderMeulen
f9c9cd95de Backed out changesets 72a80fc289f2, 30258cd308b5, and c572890f16a2 (bug 910189) for robocop orange. 2013-12-18 20:37:16 -05:00
Tim Taubert
f96735c7a9 merge m-c to elm 2013-12-18 17:54:23 +01:00
Margaret Leibovic
0e226a2407 Bug 950919 - (Part 3) Create utility StringUtils.getQueryParameter. r=mcomella 2013-12-17 22:43:31 -08:00
Margaret Leibovic
0081055c48 Bug 950919 - (Part 2) Get rid of "aboutHomePage" flag. r=mcomella 2013-12-17 22:43:31 -08:00
Margaret Leibovic
13b249a325 Bug 950919 - (Part 1) Get rid of loadHomePage method. r=mcomella 2013-12-17 22:43:30 -08:00
Wes Kocher
5a758c8dc1 Merge m-c to fx-team 2013-12-17 21:21:30 -08:00
Wes Kocher
c384670002 merge inbound to m-c 2013-12-17 21:00:02 -08:00
Richard Newman
a9b2628d78 Bug 947261 - Ensure that mActionItemBarPresenter is removed from the menu when cleared. r=sriram 2013-12-17 20:44:14 -08:00
Wes Johnston
359686fa22 Bug 950464 - Fixup typo. r=margaret 2013-12-17 19:51:01 -08:00
Raymond Agbeame
9619171f23 Bug 950785 - Remove unused selectWord and selectWordContext. r=margaret 2013-12-17 18:22:42 -08:00
Wes Johnston
8a5c001da8 Bug 950464 - Default to selecting all text in SelectionHandler. r=margaret 2013-12-17 18:18:35 -08:00
Mark Finkle
e6c0020c69 Bug 951157 - Remove desktop bits from Android sanitizer r=wesj 2013-12-17 20:32:20 -05:00
Mark Finkle
583e4f77ee Bug 951157 - Clear seer DB when clearing history r=blassey 2013-12-17 20:32:18 -05:00
Nick Alexander
c411aab8f5 Bug 899217 - Part 2: Connect about:accounts to FirefoxAccountsHelper. r=rnewman 2013-12-17 15:14:57 -08:00
Nick Alexander
24197dea4b Bug 899217 - Part 1: Register about:accounts code. r=rnewman
This is temporary code for our first engineering milestone.  I know of
the following issues:

* the page doesn't implement the full interface and spec that the
  loaded content expects; it just does enough to work.
* logs are repeated if about:accounts is re-loaded.
2013-12-17 15:14:56 -08:00
Nick Alexander
e8c1441b27 Bug 918012 - Sync with FxAccount and token server. r=rnewman 2013-12-17 15:13:43 -08:00
Margaret Leibovic
aa7199b207 Bug 949181 - Update robocop tests to get rid of dependency on HomePager.Page. r=mcomella 2013-12-17 13:34:13 -08:00
Margaret Leibovic
805f5eb154 Bug 949181 - Get rid of the Page enum in HomePager. r=wesj 2013-12-17 13:34:10 -08:00
Nick Alexander
cd00e5e46f Merge m-c to elm 2013-12-17 13:31:03 -08:00
Ryan VanderMeulen
d4e33a3678 Merge m-c to fx-team. 2013-12-17 16:23:55 -05:00
Ryan VanderMeulen
c98267ad5b Merge fx-team to m-c. 2013-12-17 16:10:10 -05:00
Wes Johnston
29094409f6 Bug 921804 - Show checkboxes at the bottom of prompts. r=mfinkle 2013-12-17 10:15:14 -08:00
Sofia Larsson
f534a2b7c4 Bug 945251 - Remove orange highlight in reader mode buttons. r=wesj 2013-12-17 09:43:27 -08:00
Wes Johnston
348ee881e7 Bug 947281 - Fix calcuations for how many actionbar items to show. r=sriram,margaret 2013-12-17 09:41:55 -08:00
Wes Kocher
933d7a440a Merge m-c to fx-team 2013-12-16 21:35:20 -08:00
Wes Kocher
4aa54685e4 Merge inbound to m-c 2013-12-16 21:33:31 -08:00
Nicholas Nethercote
74b0c1dbd6 Bug 937635 - Install libdmd. r=glandium. 2013-12-16 19:27:10 -08:00
Ryan VanderMeulen
01e5988548 Merge m-c to inbound. 2013-12-17 16:20:31 -05:00
Margaret Leibovic
8b8147ed57 Bug 949208 - Don't use reflection to get database name in robocop tests. r=wesj 2013-12-16 16:18:56 -08:00
Ryan VanderMeulen
f86ed7f929 Merge m-c to fx-team. 2013-12-16 17:00:19 -05:00
Ryan VanderMeulen
c173096f45 Merge inbound to m-c. 2013-12-16 16:58:27 -05:00
Ryan VanderMeulen
77dca9f257 Merge fx-team to m-c. 2013-12-16 16:54:22 -05:00
Justin Dolske
406f121ef5 Bug 946549 - Remove dead code obsoleted by bug 355063 for filling passwords on load. r=MattN 2013-12-16 13:27:47 -08:00
Mark Finkle
8ff13c3208 Bug 949913 - Don't store page refreshes as history visits r=blassey 2013-12-16 16:00:08 -05:00
Nick Alexander
3bf2796013 Merge m-c to elm 2013-12-16 09:13:10 -08:00
Kartikaya Gupta
831e00fbf5 Bug 949132 - Use the FrameMetrics flag on the layers update to update APZC scroll offset instead of tracking it in widget code. r=Cwiiis 2013-12-16 12:04:46 -05:00
Kartikaya Gupta
c8af0a287c Bug 940889 - Set the scroll port size along with the CSS viewport to ensure content gets the latest innerWidth. r=Cwiiis 2013-12-16 09:53:56 -05:00
Kartikaya Gupta
c795b7fe80 Bug 940889 - Avoid calling getPageSize in setScrollClampingSize as it triggers a premature resize event to content. r=Cwiiis 2013-12-16 09:50:06 -05:00
Nick Alexander
c61eeef9d2 Bug 949880 - Refactor Android Sync's SyncAdapter for FxAccount use. r=rnewman
--HG--
extra : rebase_source : 28937855c499bb621458b15424ac67378e43f9db
2013-12-15 15:53:59 -08:00
Nick Alexander
19db3a26ae Bug 923950 - Fix Android single locale repacks. r=glandium
There are two parts to this.  The first is to add AndroidManifest.xml
as a dependency to the "no dependencies" ap_ built during packaging.
The aapt call requires it.  So "no dependencies" is more accurately
"no *resource* dependencies".

The second is to avoid including the Android res/ directory in the
language repack step.  What happens is that the l10n.py script sees
the Android res/ files left in the dist/ directory after unpacking and
expects to find them in the objdir.  They're not there, so the script
fails.  To avoid this, we delete them after unpacking.  See the
comments in packager.mk describing this process.

--HG--
extra : rebase_source : 35c3c125dddcd575c1a5e8ad58f9aa13ff2db4c3
2013-12-14 15:36:17 -08:00
Nick Alexander
51c2e9cbfe Merge m-c to elm
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-12-12 08:21:15 -08:00
Benoit Jacob
993600d299 Bug 950203 - Correctly handle EGL_NO_SURFACE result from eglCreateWindowSurface - r=kats 2013-12-18 15:49:11 -05:00
Carsten "Tomcat" Book
9a8b0c002e merge fx-team to mozilla-central 2013-12-12 13:28:08 +01:00
Brad Lassey
1d3ea22488 bug 868341 - pinch to zoom jumps all over page randomly r=mfinkle,kats 2013-12-12 01:43:44 -05:00
Chenxia Liu
8561a1e301 Bug 910189: Part 3 - Restore default search engines (no dialog). r=margaret 2013-12-20 10:35:48 -08:00
Chenxia Liu
123800a73f Bug 910189: Part 2 - Enable removing of default engines. r=margaret 2013-12-20 10:35:10 -08:00
Chenxia Liu
41bf24c887 Bug 910189: Part 1 - Add "restore defaults" hooks into settings. r=margaret
--HG--
rename : mobile/android/base/resources/xml/preferences_search.xml => mobile/android/base/resources/xml-v11/preferences_search.xml
2013-12-20 10:35:10 -08:00
Brad Lassey
14764a85a4 bug 868341 - pinch to zoom jumps all over page randomly r=mfinkle,kats 2013-12-12 01:43:44 -05:00
Wes Kocher
fd7afdc87f Merge m-c to fx-team 2013-12-19 19:53:30 -08:00
Michael Comella
3941474d7c Bug 946656 - Correct regex that determines a loading page in WaitHelper. r=margaret 2013-12-19 19:49:02 -08:00
Wes Kocher
f8ab24ed0d Merge fx-team to m-c 2013-12-19 19:09:04 -08:00
Margaret Leibovic
f00554bdfa Bug 862805 - API to allow add-ons to register custom lists on about:home. r=wesj 2013-12-19 14:51:10 -08:00
Margaret Leibovic
5c02e88abb Bug 941318 - Tests for HomeListsProvider. r=wesj 2013-12-19 14:51:09 -08:00
Margaret Leibovic
a7d8706c72 Bug 941318 - Create content provider to store home lists data. r=wesj 2013-12-19 14:51:09 -08:00
Brad Lassey
7660bbfd17 Backed out changeset 93d8c8703f4d 2013-12-19 17:49:05 -05:00
Chenxia Liu
892809e3fa Bug 910189: Part 3 - Restore default search engines (no dialog). r=margaret 2013-12-18 15:21:14 -08:00
Chenxia Liu
ce9dce990b Bug 910189: Part 2 - Enable removing of default engines. r=margaret 2013-12-18 15:21:14 -08:00
Chenxia Liu
5422a0417c Bug 910189: Part 1 - Add "restore defaults" hooks into settings. r=margaret
--HG--
rename : mobile/android/base/resources/xml/preferences_search.xml => mobile/android/base/resources/xml-v11/preferences_search.xml
2013-12-18 15:21:14 -08:00
Brad Lassey
e35d4527cf bug 944104 - support creating a GeckoView programmatically, follow up to have just one LayerView constructor r=mfinkle 2013-12-11 21:03:56 -05:00
Lucas Rocha
03f47d073e Bug 945212 - Encapsulate identity data/security mode behind a type-safe API (r=margaret) 2013-12-12 00:28:15 +00:00
Lucas Rocha
f9cbf23895 Bug 943915 - Encapsulate button click listener in SiteIdentityPopup (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
dac6b31421 Bug 943915 - Change SiteIdentityPopup's API to be package-scoped (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
a080391f5b Bug 943915 - Encapsulate SiteIdentityPopup into BrowserToolbar (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
8944238fc5 Bug 943915 - Remove 'a' prefix from arguments in ArrowPopup/SiteIdentityPopup (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
ebb6ea8721 Bug 943915 - Add ArrowPopup constructor without anchor view argument (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
26762edcd2 Bug 943915 - Move SiteIdentityPopup to the toolbar package (r=wesj)
--HG--
rename : mobile/android/base/SiteIdentityPopup.java => mobile/android/base/toolbar/SiteIdentityPopup.java
2013-12-12 00:28:14 +00:00
Lucas Rocha
942d7bb2ac Bug 943915 - Small cleanup on the use of Resources in ArrowPopup (r=wesj) 2013-12-12 00:28:13 +00:00
Lucas Rocha
afb973f9c7 Bug 943915 - Move DoorHanger to the widget package (r=wesj)
--HG--
rename : mobile/android/base/DoorHanger.java => mobile/android/base/widget/DoorHanger.java
2013-12-12 00:28:13 +00:00
Lucas Rocha
dc6a70e75b Bug 943915 - Make DoorHanger's API public (r=wesj) 2013-12-12 00:28:13 +00:00
Michael Comella
1b0fadd1d4 Bug 947550 - Use Robotium side swipe methods. r=margaret 2013-12-11 14:31:55 -08:00
Nick Alexander
4eb068477b Merge m-c to elm 2013-12-11 14:08:02 -08:00
Nick Alexander
6fade1ad27 Bug 934646 - Part 3: Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
extra : rebase_source : f6ec8a38594e70520b10202c735dc019f8c856fd
2013-12-11 21:20:07 -08:00
Nick Alexander
e3dc10d7c3 Bug 934646 - Part 2: Replace hard-coded Android resource ID. r=mfinkle
--HG--
extra : rebase_source : f37370654b9bb59573c4703c5f097ff792b3f037
2013-12-11 21:16:55 -08:00
Nick Alexander
e634dd0b92 Bug 934646 - Part 1: Delete unused resources. r=mfinkle
--HG--
extra : rebase_source : 0cb4e5f30e54971b912706f5eaba8c8284b5a6ec
2013-12-11 21:16:54 -08:00
Ryan VanderMeulen
ec34e0fb19 Merge inbound to m-c. 2013-12-11 13:32:11 -05:00
Nick Alexander
17885804f2 Merge m-c to elm 2013-12-11 10:25:40 -08:00
Ryan VanderMeulen
789c341d29 Backed out changeset 0aeb846dc2e7 (bug 846340) for causing frequent testMasterPassword failures (bug 915449). 2013-12-11 08:51:02 -05:00
Carsten "Tomcat" Book
a7a7bbcfe5 merge fx-team to mozilla-central 2013-12-11 10:15:44 +01:00
Geoff Brown
e5708621ad Bug 948591 - Disable testClearPrivateData on Android x86 for too many intermittent failures 2013-12-10 19:34:58 -07:00
Geoff Brown
4db5bb07b0 Bug 907768 - Disable testSearchSuggestions on Android x86 for too many intermittent failures 2013-12-10 19:34:56 -07:00
Wes Kocher
d3ea48a878 Merge inbound to m-c 2013-12-10 16:42:47 -08:00
Wes Kocher
e3bce8ae11 Merge fx-team to m-c 2013-12-10 15:58:54 -08:00
Ryan VanderMeulen
e6e2bad3d0 Merge fx-team to m-c. 2013-12-10 15:39:40 -05:00
Wes Johnston
9da681c2b2 Bug 948157 - Use custom style for native action bar. r=sriram 2013-12-10 10:51:23 -08:00
Wes Johnston
381eadd30d Bug 947793 - Change clipboard manager hasText implementation to directly query the android clipboardservice. r=jchen 2013-12-10 10:46:13 -08:00
Wes Johnston
c5dc1f883a Bug 947321 - Set all actionmode icons to show if room. r=margaret 2013-12-10 10:46:08 -08:00
Richard Newman
fb6845b990 Bug 932092 - Part 2: support natively sending UI telemetry events from Java. r=mfinkle 2013-12-10 10:41:34 -08:00
Ryan VanderMeulen
6fb3114a62 Merge m-c to inbound. 2013-12-10 15:48:16 -05:00
Randell Jesup
fac641fbfb Bug 853356: backout p1 2013-12-10 01:00:18 -05:00
Michael Comella
7a2f204cff Bug 947527 - Correct waitForPageIndex output per device. r=margaret 2013-12-09 17:52:36 -08:00
Stefan Sobering
f45491b9cd Bug 947610 - Fix spelling error in "remember password" string. r=mcomella 2013-12-10 10:29:38 -05:00
Ryan VanderMeulen
15c6ad1a06 Merge fx-team to m-c. 2013-12-09 17:21:47 -05:00
Alex Keybl
b260957292 Merging in version bump NO BUG 2013-12-09 13:38:06 -05:00
Jonathan Watt
b9c0b3f28e Bug 947718 - Work around bug 946184 for Aurora. r=bz 2013-12-08 21:27:28 +00:00
Benjamin Smedberg
b68e9f44c2 Bug 853973 - If a plugin is overlayed by other content on the page, then treat it as a hidden plugin: hide the overlay and present the infobar for click-to-play or crashed plugins, r=jaws 2013-12-17 10:53:32 -05:00
Phil Ringnalda
304d9f6577 Merge m-c to b-i 2013-12-07 08:28:10 -08:00
Carsten "Tomcat" Book
5484d45941 merge fx-team to mozilla-central 2013-12-07 12:47:39 +01:00
Wes Kocher
ea7a42ee9b merge m-c to b2g-inbound 2013-12-06 20:49:02 -06:00
Wes Kocher
dabbd9e4be merge m-c to fx-team 2013-12-06 20:48:11 -06:00
Geoff Brown
f9a7943396 Bug 957185 - Disable robocop testHomeBanner, testPromptGridInput on Android x86 only, for too many failures 2014-01-14 17:20:01 -07:00
Geoff Brown
e1ed1a4576 Bug 945675 - Disable testMozPay on Android 2.2 for too many intermittent failures 2013-12-06 16:02:49 -07:00
Alfredo Yang
e36a238d1e Bug 853356 - Part1 Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-12-06 17:38:51 -05:00
Margaret Leibovic
803715f1ba Bug 941357 - (Part 2) Update BrowserProvider to use PerProfileDatases. r=rnewman 2013-12-09 09:06:02 -08:00
Margaret Leibovic
ab39990106 Bug 941357 - (Part 1) Consolidate per-profile content provider logic in PerProfileDatabases, starting with TabsProvider. r=rnewman 2013-12-09 09:05:59 -08:00
Lucas Rocha
3c46d14f74 Bug 946517 - Provide MOZ_DISABLE_PROGUARD envvar to disable ProGuard (r=rnewman) 2013-12-09 12:21:38 +00:00
Brian Nicholson
fd426c961c Bug 878597 - Ignore selected flag for stubbed tabs in Tab:Added listener. r=mfinkle 2013-12-09 21:59:01 -08:00
Mark Capella
ce86138bca Bug 946030 - HTMLTextAreaElement should be considered an input element for text selection, r=wesj, f=margaret 2013-12-06 14:55:26 -05:00
Michael Comella
73bb85c991 Bug 938827 - Part 10: Remove remaining reflection from FennecNativeActions. r=rnewman 2013-12-06 11:43:12 -08:00
Michael Comella
856538ad58 Bug 938827 - Part 9: Remove unregisterEventListener reflection. r=rnewman 2013-12-06 11:43:12 -08:00
Michael Comella
da3ac3d82a Bug 938827 - Part 8: Remove registerEventListener reflection. r=rnewman 2013-12-06 11:43:11 -08:00
Michael Comella
dc0c8ebbba Bug 938827 - Part 7: Remove preferences event reflection. r=rnewman 2013-12-06 11:43:11 -08:00
Michael Comella
0e46eddbbd Bug 938827 - Part 6: Remove BroadcastEvent reflection. r=rnewman 2013-12-06 11:43:11 -08:00
Michael Comella
e8e777aa4e Bug 938827 - Part 5: Remove querySql reflection. r=rnewman 2013-12-06 11:43:11 -08:00
Michael Comella
02fc2ef104 Bug 938827 - Part 3: Call registerEventListener directly. r=rnewman 2013-12-06 11:43:11 -08:00
Michael Comella
7f6de6ba25 Bug 938827 - Part 2: Call PanningPerfAPI directly. r=rnewman 2013-12-06 11:43:10 -08:00
Michael Comella
999dc15cde Bug 938827 - Part 1: Get LayerView in getSurfaceView. r=rnewman 2013-12-06 11:43:10 -08:00
Carsten "Tomcat" Book
9a02f4280b Merge mozilla-central to mozilla-inbound 2014-01-22 14:37:23 +01:00
Martyn Haigh
d7982cce17 Bug 957056 - pass correct status argument to _initRuntime; r=wesj 2014-01-22 00:53:25 -08:00
Myk Melez
5932f7fdbf Bug 953328 - make about:apps work with synthetic APKs; r=wesj 2014-01-22 00:50:02 -08:00
Michael Comella
9e551f9936 Bug 947508 - Correct assertCurrentPage output. 2013-12-06 16:53:47 -08:00
Michael Comella
8f53f4c275 Bug 946547 - Change TestConstants package to org.mozilla.gecko.tests. r=bnicholson 2013-12-06 16:50:56 -08:00
retornam
df63415f90 Bug 790898 - Match desktop in restrictions for Add Search Engine option. r=margaret 2013-12-06 16:03:21 -08:00
Mark Finkle
b682b58a12 Bug 943475 - Predictive lookup for awesomebar entries r=rnewman 2013-12-05 23:50:23 -05:00
Lucas Rocha
d1f1587fdd Bug 933739 - Use given search term in handleAutocomplete, not mSearchTerm (r=bnicholson) 2013-12-05 23:50:13 -05:00
Geoff Brown
0c6feeddad Bug 915449 - Avoid EditText error in testMasterPassword; r=jmaher 2013-12-16 09:57:01 -07:00
Richard Newman
735bd4e31f Bug 946074 - Awesomebar cursor processing is inefficient. r=mfinkle 2013-12-03 22:02:28 -08:00
Tetsuharu OHZEKI
cf503a50b2 Bug 944925 - Add an option to switch dynamic toolbar mode. r=mleibovic 2013-12-06 10:29:27 -05:00
Wes Kocher
8f3b601c7c Merge m-c to inbound 2014-01-06 18:14:57 -08:00
Ehsan Akhgari
37b2774903 Bug 956783 - Stop using NULL in Fennec's JNI code; r=jchen 2014-01-06 15:21:27 -05:00
Mark Finkle
75d446089d Bug 962963 - Use a shorter tab expiration timeout r=kats 2014-01-24 09:08:05 -05:00
Mark Finkle
bac50e4147 Bug 962963 - Decouple tab expiration code r=margaret 2014-01-24 09:08:01 -05:00
Mark Finkle
e72316ce1e Bug 962963 - Be more aggressive about expiring tabs r=kats r=margaret 2014-01-24 09:07:58 -05:00
Carsten "Tomcat" Book
b6007c09a9 Merge m-c to fx-team 2013-12-06 07:58:06 +01:00
Mark Finkle
ecf7141363 Backout f118b840cabe, 8f90c8059733, d440fa8a1568 because bug 946074 breaks a test 2013-12-06 01:41:50 -05:00
Wes Johnston
8c99faf61a Bug 943513 - Lazy load animation time. r=lucasr 2013-12-05 22:32:11 -08:00
Mark Finkle
10d194b3ef Bug 943475 - Predictive lookup for awesomebar entries r=rnewman 2013-12-05 23:50:23 -05:00
Lucas Rocha
9c30a52f0d Bug 933739 - Use given search term in handleAutocomplete, not mSearchTerm (r=bnicholson) 2013-12-05 23:50:13 -05:00
Richard Newman
d2713f6e6a Bug 946074 - Awesomebar cursor processing is inefficient. r=mfinkle 2013-12-03 22:02:28 -08:00
James Willcox
ee3ad9642d Bug 869368 - Fix Flash plugin positioning on Android 2.3 r=clord
--HG--
extra : rebase_source : a02d012302a161897fb0e34f32386b57e6e7a088
2013-12-18 11:17:59 -06:00
Brad Lassey
b4b8665da8 bug 944043 - security exception on start up for GeckoView app r=mfinkle 2013-11-27 18:37:44 -05:00
Wes Johnston
3ad0f3a8aa Bug 875750 - Provide a basic color picker for Android. r=mfinkle 2013-12-11 15:51:01 -08:00
Brian Nicholson
709eccd128 Backout 078a331fb494 (bug 949048) for robocop failures CLOSED TREE 2013-12-11 13:05:09 -08:00
Brian Nicholson
e50c838e74 Bug 949048 - Fix favicon/thumbnail checks in testBrowserProvider. r=margaret 2013-12-11 11:01:18 -08:00
Brad Lassey
d7c4523357 bug 944104 - support creating a GeckoView programmatically r=mfinkle 2013-11-27 17:58:41 -05:00
Brad Lassey
3333d49ee9 bug 944168 - null pointer when adding tab with GeckoView r=mfinkle 2013-11-27 18:27:53 -05:00
Neil Bleasdale
a845716dba Bug 956484 - Move inline js from /mobile/android/chrome/content/aboutPrivateBrowsing.xhtml into separate js file. r=mbrubeck 2014-01-15 09:35:54 -05:00
Joshua Dover
ecbd09bf06 Bug 953272 - Add selected attribute for prompts with multichoice. r=wesj 2014-01-14 11:27:02 -08:00
Margaret Leibovic
825e8d3671 Bug 946486 - Don't cache "browser.snippets.enabled" value. r=bnicholson 2013-12-05 12:43:22 -08:00
Mark Finkle
0f50cd0ad3 Bug 946779 - Disable history in the hidden reader <browser> element r=lucasr 2013-12-05 12:08:55 -05:00
Lucas Rocha
9599408bb8 Bug 935473 - Change animateForwardButton() to take an animation argument (r=wesj) 2013-12-05 16:26:36 +00:00
Lucas Rocha
884dd8e002 Bug 935473 - Add comment explaining animateForwardButton's behaviour (r=wesj) 2013-12-05 16:26:35 +00:00
Lucas Rocha
fd5abbe8e9 Bug 935473 - Change updateBackButton/updateForwardButton to take a Tab argument (r=wesj) 2013-12-05 16:26:35 +00:00
Lucas Rocha
47bafa663a Bug 935473 - Update forward button visibility when exiting editing mode (r=wesj) 2013-12-05 16:26:35 +00:00
Lucas Rocha
27ec5ed06e Bug 935473 - Factor out method to animate forward button's visibility (r=wesj) 2013-12-05 16:26:35 +00:00
Lucas Rocha
daefc5178d Bug 935473 - Avoid unnecessary animations in forward button (r=wesj) 2013-12-05 16:26:35 +00:00
Lucas Rocha
c66f80cdb1 Bug 935473 - Replace ViewGroup.MarginLayoutParams with MarginLayoutParams (r=sriram) 2013-12-05 16:26:34 +00:00
Lucas Rocha
190480b342 Bug 945375 - Unconditionally return mSubmenu in GeckoMenuItem.getSubMenu() (r=rnewman) 2013-12-05 11:16:45 +00:00
Wes Johnston
22195de062 Bug 942680 - Place search pane below actionbar. r=lucasr 2013-12-04 21:20:19 -08:00
Wes Johnston
33cb028f34 Bug 943513 - Update visual style of action modes. r=lucasr 2013-12-04 08:35:58 -08:00
Michael Comella
6c6b346d45 Bug 910859 - Part 4: Add Proguard annotations. r=ckitching 2013-12-04 18:32:53 -08:00
Michael Comella
cc40a4f34d Bug 910859 - Part 3: Add missing go button work around. r=lucasr 2013-12-04 18:32:53 -08:00
Michael Comella
3e4470a648 Bug 910859 - Part 2: Wait for DOMTitleChanged event in waitForPageLoad. r=lucasr 2013-12-04 18:32:53 -08:00
Michael Comella
f0c34d1e5e Bug 910859 - Bootstrap new API for UI testing in Fennec. r=lucasr,gbrown 2013-12-04 18:32:53 -08:00
Ryan VanderMeulen
2ec48f94e7 Merge inbound to m-c on a CLOSED TREE. 2013-12-04 17:35:44 -05:00
Gian-Carlo Pascutto
eaad65b612 Bug 933775 - Fix download timestamp by changing 'when' parameter to contain time since epoch. r=wesj 2013-12-04 13:31:00 +01:00
Richard Newman
b657005a37 Bug 941844 - Part 3: additional Robocop checks for page titles. r=trivial 2013-12-03 20:21:33 -08:00
Margaret Leibovic
60712ffec0 Bug 943466 - Fix copy/cut errors in SelectionHandler. r=wesj 2013-12-03 14:47:37 -08:00
Richard Newman
1455270433 Bug 945832 - java.lang.IllegalStateException: No ContextGetter; cannot fetch prefs. on rotation or system locale change. r=wesj 2013-12-03 15:05:43 -08:00
Richard Newman
9ca672e19b Bug 936756 - Switch locales via pref, not via system locale setting. r=mfinkle,sriram (relanded as one patch) 2013-12-03 15:05:43 -08:00
Margaret Leibovic
72ed686f8f Bug 933420 - Update bookmark item view when title is edited. r=rnewman 2013-12-03 12:39:27 -08:00
Mike Hommey
728c45d666 Bug 943728 - Fixup for multilocale builds. r=me 2013-12-04 07:28:03 +09:00
Ryan VanderMeulen
c3d3e82743 Merge inbound to m-c. 2013-12-03 16:45:17 -05:00
Richard Newman
e26b65d95a Merge m-c to fx-team. 2013-12-03 10:47:15 -08:00
Mark Finkle
1a77654367 Backout 9ebed437d78f, 606c4b4ab77f, 686b4b5a5be3, c46514ce6886, 9cbe6533c480 due to critical breakage in bug 945723 2013-12-03 10:15:26 -05:00
Carsten "Tomcat" Book
c40b2ecd96 merge fx-team to mozilla-central 2013-12-03 10:39:56 +01:00
Margaret Leibovic
73928f1858 Bug 941685 - Ping metrics server with snippets impression data. r=bnicholson 2013-12-02 16:54:21 -08:00
Lucas Rocha
93be7d818e Bug 944537 - Don't send showMessage boolean with Tabs.START event (r=mfinkle) 2013-12-03 16:20:32 +00:00
Lucas Rocha
cd0eb4fdbb Bug 944537 - No need to check for showProgress in BrowserToolbar (r=mfinkle) 2013-12-03 16:20:31 +00:00
Lucas Rocha
c2617f7947 Bug 944537 - Use message data to decide whether to show Tab progress or not (r=mfinkle) 2013-12-03 16:20:31 +00:00
Lucas Rocha
7a812d26d4 Bug 944537 - No need to store showProgress as a Tab state/param (r=mfinkle) 2013-12-03 16:20:31 +00:00
Chris Lord
2fab05a2c9 Bug 950696 - Cache the 'enable tiles' layers pref. r=bgirard
Rename layers.force-tiles to layers.enable-tiles and cache it with the other
layers prefs in gfxPlatform.
2013-12-17 14:02:16 +00:00
Masayuki Nakano
d16795393e Bug 912858 part.5 Implement KeyboardEvent.key for printable keys on Android r=jchen+smaug 2013-12-11 01:14:54 +09:00
Chris Lord
18df7b2db7 Bug 956420 - Fix fixed margins on shorter-than-the-viewport pages. r=kats
If a page is shorter than the screen, but taller than the screen with margins,
and has a fixed position top or bottom bar, it would be offset incorrectly
when scrolling downwards.
2014-01-15 16:58:48 +00:00
Gregory Szorc
158ed8b3ec Bug 774572 - Part 2: Define JAR_MANIFESTS in moz.build files; r=glandium
Every directory with a jar.mn now has JAR_MANIFESTS defined in its
moz.build file.

We also removed the may_skip special consideration of jar.mn files
because this information is now available during tier traversal by the
reader courtesy of the variables being present in moz.build files.

--HG--
extra : rebase_source : 21049b15e6bd9cf65b0805ccaccc4ba5aae93c98
extra : amend_source : 0b1ea866d725beef92d37c6f6d475369ac002e19
2013-12-10 16:18:11 +09:00
Mike Hommey
13372f862b Bug 946576 - Disable unified builds on b2g and xulrunner builds, and android debug builds. r=ehsan 2013-12-06 08:45:29 +09:00
Carsten "Tomcat" Book
e8b7ad5f14 Merge m-c to mozilla-inbound 2013-12-03 11:29:37 +01:00
CJ Barker
39919c1b52 Bug 870049 - Added SharedPreferences to persistent Crash Report client settings. r=bnicholson 2013-12-02 22:46:06 -05:00
Chris Kitching
a010c19c34 Bug 709230 - Part 5: activate Proguard. r=gbrown,rnewman 2013-11-18 17:30:00 -08:00
Ryan VanderMeulen
89058b6357 Merge fx-team to m-c. 2013-12-02 16:43:03 -05:00
Michael Boon
56a6822193 Bug 923237 - Updater should immediately apply update when downloaded manually. r=snorp 2013-12-02 12:51:25 -05:00
Nick Alexander
93e112c0d8 Merge m-c to elm 2013-11-18 08:22:59 -08:00
Ryan VanderMeulen
cb5b5eee51 Merge m-c to inbound on a CLOSED TREE. 2013-12-11 22:39:20 -05:00
James Willcox
9a9278242c Bug 948003 - Mark GeckoAppShell.loadPluginClass() as used from JNI r=blassey 2013-12-11 15:53:06 -06:00
Michael Comella
5096ff5098 Bug 946656 - Add debug output to ToolbarTitleTextChangeVerifier. r=margaret 2013-12-18 09:55:32 -08:00
Frederik Braun
50df192add Bug 948894 - Move inline scripts for about:apps into AboutApps.js. r=mleibovic 2013-12-18 12:59:21 +01:00
Nick Alexander
c4c4054b38 Merge m-c to elm 2013-11-14 22:41:14 -08:00
Ryan VanderMeulen
bc153b7708 Merge fx-team to m-c on a CLOSED TREE. 2013-11-14 22:19:19 -05:00
Ryan VanderMeulen
e57afbe1f2 Merge m-c to inbound. 2013-12-02 16:58:15 -05:00
Mike Hommey
bf60896454 Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense). r=mshal 2013-12-03 06:34:21 +09:00
Nick Alexander
06134af972 Merge b-i to elm 2013-11-13 21:16:19 -08:00
Nick Alexander
1388c07693 Bug 922147 - Abstract password out of Android Sync auth flow. r=rnewman
--HG--
extra : amend_source : 785ee7294bce83665caa3d79ee2144644fc7b9b5
extra : histedit_source : b4b47d0903d6f94b8bd08b78654b4538d18e220f%2Cf89a9d672b5ac4e13481abfcc0f937182680eddd
2013-11-13 19:36:02 -08:00
Nick Alexander
3360f7d3bf Bug 933300 - Write preprocessed Fennec code into generated/org/mozilla/*. r=glandium 2013-11-13 19:32:55 -08:00
Nick Alexander
fc061cca31 Backed out changeset ba9c8fcf76e6 (bug 933300) 2013-11-13 17:11:58 -08:00
Nick Alexander
2cde72ea2c Backed out changeset 569d58c88da3 (bug 922147) 2013-11-13 17:03:18 -08:00
Nick Alexander
d173d8dae4 Backed out changeset 1bef02988eb7 (bug 922147) 2013-11-13 17:03:17 -08:00
Nick Alexander
302f127195 Merge b-i to elm 2013-11-13 15:48:47 -08:00
Nick Alexander
a962481cd5 Bug 922147 - Follow-up: Fix build bustage on a CLOSED TREE.
--HG--
extra : amend_source : 20b3c088b9bfe11ca4a187fe1d96334f4196f323
2013-11-13 15:43:20 -08:00
Nick Alexander
73d7019012 Bug 892025 - Implement Android client for FxAccount auth server. r=rnewman 2013-11-13 15:27:13 -08:00
Nick Alexander
954a0cd13b Merge b-i to elm
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
2013-11-13 15:16:51 -08:00
Nick Alexander
99d5d20513 Bug 922147 - Abstract password out of Android Sync auth flow. r=rnewman 2013-11-13 15:11:16 -08:00
Nick Alexander
4bf3628f8f Merge m-c to elm 2013-11-13 13:43:32 -08:00
Chris Kitching
a23ca26511 Bug 913985: Part 6 - Remove redundant AndroidBridge::Bridge() checks. r=kats 2013-11-12 10:41:01 -08:00
Chris Kitching
7144e8c767 Bug 913985: Part 5 - Refactor the Bridge to use the generated code. r=kats 2013-11-12 10:41:01 -08:00
Chris Kitching
a053b765bb Bug 913985: Part 3 - Update the annotation processor to generate wrapper classes. r=kats
--HG--
rename : build/annotationProcessors/MethodWithAnnotationInfo.java => build/annotationProcessors/AnnotationInfo.java
rename : build/annotationProcessors/utils/AlphabeticMethodComparator.java => build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
rename : build/annotationProcessors/utils/GeneratableEntryPointIterator.java => build/annotationProcessors/utils/GeneratableElementIterator.java
2013-11-21 20:41:28 +00:00
Chris Kitching
c47d9f7dc4 Bug 913985: Part 2 - Add annotations to all remaining JNI entry points, marking them for generations. r=kats 2013-11-12 10:41:00 -08:00
Chris Kitching
d522296441 Bug 913985: Part 1 - Introduce a nicer annotation API for the generator, and migrate all existing annotations to it. r=kats
--HG--
rename : mobile/android/base/mozglue/OptionalGeneratedParameter.java => mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java
rename : mobile/android/base/mozglue/GeneratableAndroidBridgeTarget.java => mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java
2013-11-12 10:40:59 -08:00
Lucas Rocha
ae0e640603 Bug 883500 - Update query to avoid bookmarks with null URLs. r=mfinkle 2013-11-18 15:40:27 -08:00
Ryan VanderMeulen
4e7cc6f723 Merge m-c to fx-team. 2013-11-21 11:39:17 -05:00
Ryan VanderMeulen
6ce6c0bddf Backed out changeset 95562517dc8c (bug 938818) for Android crashes. 2013-11-21 11:06:22 -05:00
Carsten "Tomcat" Book
247dddda8c merge fx-team to mozilla-central 2013-11-21 14:32:10 +01:00
Lucas Rocha
c54806862f Bug 939060 - Check URL associated with grid item before displaying favicon. r=rnewman 2013-11-20 17:09:51 -08:00
Brad Lassey
774d62c601 bug 930059 - Overscroll.java doesn't need to use compatibility libraries, follow up to not use invalidateAfterAnnimation on ICS r=wesj 2013-11-20 14:35:10 -08:00
Taylor Skidmore
69109ed2d8 Bug 938818 - Change calls to mLayerView.setVisibility to mLayerView.show or .hide. r=mcomella 2013-11-20 20:04:42 -05:00
Lucas Rocha
81377fa2d1 Bug 937534 - Only handle BACK key on ACTION_UP in Bookmarks page (r=mfinkle) 2013-11-21 13:43:21 +00:00
Benoit Jacob
44c927d7a3 Bug 834243 - avoid calling serverSurfaceChanged before the compositor is created - r=vladv 2013-11-20 17:50:54 -05:00
Wes Johnston
07c420e561 Bug 936593 - Allow overriding active button colors. r=mfinkle 2013-11-12 16:23:52 -08:00
Nick Alexander
4f14336bed Bug 933300 - Write preprocessed Fennec code into generated/org/mozilla/*. r=glandium
This writes source with preprocessed package names into
generated/org/mozilla/{firefox,firefox_beta,fennec,fennec_$USERID},
and the other preprocessed source into generated/org/mozilla/gecko.

This layout matches the Java package hierarchy and is what IDEs expect
when including $OBJDIR/generated as a source directory.

--HG--
extra : rebase_source : 5cc397e6808d21a662c1f718ef49ee148c15e465
2013-11-11 23:39:16 -05:00
Swaroop Rao
5a589e67be Bug 936727 - Garble account name that is logged by UpgradeReceiver. r=rnewman 2013-11-13 08:23:02 -05:00
Brian Nicholson
def58437dd Bug 874985 - Part 3: Session restore tests. r=gbrown 2013-11-15 22:59:17 -08:00
Brian Nicholson
22fc041390 Bug 874985 - Part 2: Add stateBundle extra to allow injecting fake state bundles. r=mfinkle,gbrown 2013-11-15 22:59:17 -08:00
Brian Nicholson
43c3f0d4ad Bug 874985 - Part 1: Robustify existing test methods. r=gbrown 2013-11-15 22:59:16 -08:00
Brian Nicholson
85e2a1e3bc Bug 937945 - Don't store Context in GeckoProfile. r=rnewman 2013-11-15 22:53:53 -08:00
Benoit Jacob
e1e0174f07 Bug 925608 - 8/8: remove mServerSurfaceValid - r=kats 2013-11-15 11:29:01 -05:00
Benoit Jacob
1d3a8d8fae Bug 925608 - 7/8: rename ProvideEGLSurface to CreateEGLSurfaceForCompositor - r=kats 2013-11-15 11:28:59 -05:00