Commit Graph

13638 Commits

Author SHA1 Message Date
Ed Morley
f87f02576b Backed out changeset 1bb1e5ed3272 (bug 1030743) 2014-06-27 15:39:53 +01:00
Carsten "Tomcat" Book
5b2ca0df88 Merge mozilla-central to fx-team 2014-06-27 15:53:53 +02:00
Carsten "Tomcat" Book
2f05201952 merge fx-team to mozilla-central a=merge 2014-06-27 15:47:39 +02:00
Carsten "Tomcat" Book
2ab07cce72 Backed out changeset 8c1ee05fbbd6 (bug 949617) 2014-06-27 15:17:42 +02:00
Richard Newman
2fca312a2b Bug 1030740 - Add return statements inadvertently omitted from Bug 1025937. r=mcomella 2014-06-26 09:48:48 -07:00
Carsten "Tomcat" Book
af394a68f4 Merge mozilla-central to fx-team 2014-06-26 15:53:44 +02:00
Carsten "Tomcat" Book
39ff1551ea merge fx-team to mozilla-central a=merge 2014-06-26 15:33:24 +02:00
Randall Barker
d377c60d8e Bug 1031000 - Fix problem with TabSource Prompt. r=blassey 2014-06-26 14:21:00 +02:00
Nick Alexander
28091f2620 Bug 1030734 - Fix BROWSER_INTENT_{PACKAGE,CLASS} in background after Bug 929865. r=rnewman 2014-06-26 18:57:32 -07:00
Shashank Sabniveesu
703d2f56da Bug 1026010 - Rename GeckoApp.ACTION_BOOKMARK to ACTION_HOMESCREEN_SHORTCUT. r=lucasr 2014-06-25 09:10:00 -04:00
Franz Sarmiento
9fa64c649c Bug 1028728 - Update findListViewWithTag consumers to use strings from HomePager. r=mcomella 2014-06-24 21:41:00 -04:00
Wes Kocher
dd1f16a365 Merge m-c to inbound a=merge 2014-07-01 17:38:49 -07:00
Jim Blandy
60b1de8ae5 Bug 800200: Remove jsdservice.xpt from package manifests. r=glandium 2014-07-01 12:11:51 -07:00
Ed Morley
d3f825585d Backed out changeset 57e490053263 (bug 1018928) for causing the intermittent test failures in bug 1032991 2014-07-03 13:53:15 +01:00
Gian-Carlo Pascutto
b7a4bcd508 Bug 1018928 - Expand Android gUM + gUM Doorhanger tests. r=mfinkle 2014-07-01 15:38:03 +02:00
Eric Edens
64cef48529 Bug 881091 - Don't set byline if byline is too long. r=lucasr 2014-05-16 11:03:49 -07:00
Brad Lassey
4912336acd bug 1030743 - NullPointerExceptions in GeckoPreferences r=rnewman 2014-06-26 09:48:23 -04:00
Brad Lassey
079242066b bug 1030738 - NullPointerException when getting action bar r=rnewman 2014-06-26 09:41:42 -04:00
Brad Lassey
02952ad167 bug 1025931 - Crash java.lang.NullPointerException in in org.mozilla.gecko.GeckoAppShell.getContext r=snorp 2014-06-26 09:37:47 -04:00
Wes Kocher
c0ad0c4c48 Merge m-c to inbound a=merge 2014-06-25 18:39:25 -07:00
Wes Johnston
6586998316 Bug 1018468 - Add fullscreen button to video controls. r=mfinkle 2014-06-11 10:25:18 -07:00
Chenxia Liu
4d1a7dd2b9 Bug 1007130 - Add UI telemetry for 'Adding a new search engine' button. r=mfinkle 2014-06-25 09:29:07 -07:00
Carsten "Tomcat" Book
9bf09b73ad merge fx-team to mozilla-central a=merge 2014-06-25 15:34:21 +02:00
Jim Blandy
4d6a633bba Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):

 - Never set the buffer's mode.

   Years ago, Emacs did not have a good JavaScript mode, so it made sense
   to use Java or C++ mode in .js files. However, Emacs has had js-mode for
   years now; it's perfectly serviceable, and is available and enabled by
   default in all major Emacs packagings.

   Selecting a mode in the -*- file variable line -*- is almost always the
   wrong thing to do anyway. It overrides Emacs's default choice, which is
   (now) reasonable; and even worse, it overrides settings the user might
   have made in their '.emacs' file for that file extension. It's only
   useful when there's something specific about that particular file that
   makes a particular mode appropriate.

 - Correctly propagate settings that establish the correct indentation
   level for this file: c-basic-offset and js2-basic-offset should be
   js-indent-level. Whatever value they're given should be preserved;
   different parts of our tree use different indentation styles.

 - We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
   Remove tab-width: settings, at least in files that don't contain tab
   characters.

 - Remove js2-mode settings that belong in the user's .emacs file, like
   js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Geoff Brown
a64ad906f6 Bug 979600 - Disable testSessionOOMRestore on Android 2.3 (for aws); no review 2014-06-24 20:33:31 -06:00
Geoff Brown
1e624c5076 Bug 995696 - Disable testNewTab on Android 2.3 (for aws); no review 2014-06-24 20:33:31 -06:00
Wes Kocher
591c1722c3 Merge m-c to inbound a=merge on a CLOSED TREE 2014-06-24 18:39:27 -07:00
Wes Kocher
f3ff8bca2d Merge inbound to m-c a=merge 2014-06-24 18:13:38 -07:00
Nathan Froyd
7a4dfe1208 Bug 728600 - define TARGET_XPCOM_ABI in mozilla-config.h; r=glandium 2014-06-23 15:06:48 -04:00
Ed Morley
3c4b087f1e Merge mozilla-central and inbound 2014-06-24 17:18:28 +01:00
Ed Morley
4ffd0ec330 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-24 17:02:56 +01:00
Wes Kocher
3a1d1b9839 Merge m-c to fx-team a=merge 2014-06-23 19:07:22 -07:00
Wes Kocher
3f15cb212c Merge fx-team to m-c a=merge 2014-06-23 17:56:11 -07:00
Margaret Leibovic
89d579fb75 Bug 1026715 - Add "Open all" item to recent tabs lists. r=lucasr 2014-06-23 14:13:05 -07:00
Michael Comella
e3e2b20616 Bug 1002303 - Part 3: Update empty private tabs panel description. r=eedens 2014-06-23 11:35:03 -07:00
Ethan Pransky
1f72868fff Bug 1019009 - Make MatrixBlobCursor complain if its Cursors are not properly closed. r=gcp 2014-06-24 17:32:28 +02:00
Michael Comella
5b8908ea49 Bug 1028337 - Fix crash when closing all private tabs. r=margaret 2014-06-23 11:01:37 -07:00
Michael Comella
b8f99607b5 Bug 979600 - Increase verifyPageTitle wait timeout. r=gbrown 2014-06-23 10:54:57 -07:00
Gian-Carlo Pascutto
b3264d7ef1 Bug 1018928 - Fix getUserMedia device selection on Android. r=blassey 2014-06-24 10:22:50 +02:00
Kartikaya Gupta
4aba255ad5 Bug 1020778 - Reduce opacity of low-res buffer on B2G by half when compositing it to the screen. r=jrmuizel 2014-06-23 12:00:18 -04:00
Margaret Leibovic
cb3ad1023c Bug 1004850 - (Part 7) Update robocop tests to account for new panel. r=mcomella 2014-06-22 16:26:50 -04:00
Margaret Leibovic
f07afb55cc Bug 1004850 - (Part 6) Add HomeConfigPrefsBackend migration to add recent tabs panel. r=lucasr 2014-06-22 16:26:50 -04:00
Margaret Leibovic
8234a906e7 Bug 1004850 - (Part 5) Add recently closed tabs to RecentTabsPanel. r=lucasr,bnicholson 2014-06-22 16:26:49 -04:00
Margaret Leibovic
c4dfafde8a Bug 1004850 - (Part 4) Update RecentTabsAdapter to be a MultiTypeCursorAdapter. r=lucasr 2014-06-22 16:26:49 -04:00
Margaret Leibovic
a0e53f0768 Bug 1004850 - (Part 3) Create RecentTabsPanel from existing LastTabsPanel. r=lucasr
--HG--
rename : mobile/android/base/home/LastTabsPanel.java => mobile/android/base/home/RecentTabsPanel.java
rename : mobile/android/base/resources/layout/home_last_tabs_panel.xml => mobile/android/base/resources/layout/home_recent_tabs_panel.xml
2014-06-22 16:26:49 -04:00
Margaret Leibovic
c1bb60fed7 Bug 1004850 - (Part 2) Rename MostRecentPanel to HistoryPanel. r=lucasr
--HG--
rename : mobile/android/base/home/MostRecentPanel.java => mobile/android/base/home/HistoryPanel.java
rename : mobile/android/base/resources/layout/home_most_recent_panel.xml => mobile/android/base/resources/layout/home_history_panel.xml
2014-06-22 16:26:48 -04:00
Margaret Leibovic
ffd6ad6bcc Bug 1004850 - (Part 1) Replace HistoryPanel with MostRecentPanel. r=lucasr 2014-06-22 16:26:48 -04:00
Nick Alexander
3060f6e1c8 Bug 1022749 - Show custom server URLs in setup activities. r=rnewman
========

cf613656fe
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1022749 - Part 2: Show custom server URLs in status activity.

========

91268a261f
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1022749 - Part 1: Show custom server URLs in setup activities.
2014-06-09 17:31:58 -07:00
Nick Alexander
535ad13f99 Bug 1022748 - Part 2: Use custom server URLs in setup activities. r=rnewman
========

2582a39b7f
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1022748 - Review comments.

========

8c9a8df84f
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1022748 - Part 4: Don't show Get Started activity when custom server URLs are passed.

    The Get Started activity provides no feedback about custom URLs, and it
    just gets in the way of power users, so skip it entirely.

========

2701a9ea52
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Jun 9 17:25:51 2014 -0700

    Bug 1022748 - Part 3: Pass through server details to update credentials activity.

    This information can be extracted from the AndroidFxAccount object in
    the activity, but feeding the information through extras keeps the
    processing and display pipeline uniform across all setup activities.

========

b9dd884764
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Jun 9 17:17:57 2014 -0700

    Bug 1022748 - Part 2: Use custom server URLs passed through extras in setup activities.

========

be8284ea25
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Jun 9 15:06:03 2014 -0700

    Bug 1022748 - Part 1: Pass extras through setup activities.

    This also passes the password button's show/hide state between create
    and set up.
2014-06-21 16:21:41 -07:00
Nick Alexander
6eca25c641 Bug 1022748 - Part 1: Pass extras through Accounts.launchSetup. r=rnewman 2014-06-22 12:01:15 -07:00
Nick Alexander
f743ed7926 Bug 1019793 - Avoid UnsupportedOperationException in TestHealthReportPruneService. r=mcomella
========

ce21e7f19a
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Jun 4 14:15:09 2014 -0700

    Bug 1019793 - Always upload in TestHealthReportUploadService.

========

e4c7393c6f
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:47:33 2014 -0700

    Bug 1019793 - Don't create storage in TestHealthReportPruneService.

    Creating real storage requires a valid Context, and in this test, we
    only have MockContext.
2014-06-21 15:42:44 -07:00
Nick Alexander
b5a3a2be4a Bug 993134 - Make TestAccountPickler tolerate multiple accounts. r=mcomella
========

872d926e32
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Jun 4 14:21:17 2014 -0700

    Bug 993134 - Part 5: Work around Android intermittent issue.

========

c76bb53901
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 17:02:15 2014 -0700

    Bug 993134 - Part 4: Make fxa.TestAccountPickler robust.

    This tested extracting data from an AndroidFxAccount before, and another
    after, backed by different Android Accounts.  Unfortunately, one Account
    replaced the other, but had the same name, leading to a race
    condition (between reading and deleting the first account).  To address
    this, we extract all the data before deleting, and then compare it to
    the data from the newly pickled account.

========

bd32978f7b
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:34:09 2014 -0700

    Bug 993134 - Part 3: Use AndroidSyncTestCaseWithAccounts to make fxa.TestAccountPickler when accounts exist.

========

ec7d910187
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:33:29 2014 -0700

    Bug 993134 - Part 2: Extract AndroidSyncTestCaseWithAccounts.

========

6563ad7bd8
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:30:15 2014 -0700

    Bug 993134 - Part 1: Make getApplicationContext return getTargetContext.

    I was finding that repeated instrumentation-test runs were returning a
    null application context, indicating a race between test start-up and
    target instantiation.  This works well for me on two test devices.
2014-06-21 15:42:38 -07:00
Nick Alexander
f6519ee881 Bug 993136 - Fix TestSyncConfiguration. r=mcomella
========

306fb330a9
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:29:55 2014 -0700

    Bug 993136 - Fix TestSyncConfiguration.
2014-06-21 15:42:31 -07:00
Richard Newman
2e18f67d80 Bug 1023451 - Part 2: apply basic heuristics for locale usability. r=mcomella 2014-06-20 14:31:53 -07:00
Richard Newman
b2e2c7a5a8 Bug 1023451 - Part 1: introduce a hook for determining whether a locale should be included in the list. r=mcomella 2014-06-20 14:31:53 -07:00
Mark Finkle
11ba82169b Bug 1028004 - UI Telemetry events with null methods are ignored r=rnewman 2014-06-20 13:39:33 -04:00
Hathibelagal A
175535e7a5 Bug 1027831 - Switch from deprecated FILL_PARENT to MATCH_PARENT in Java and XML. r=bnicholson 2014-06-20 09:21:31 -07:00
Richard Newman
33c61da5df Bug 1016611 - Part 5: be resilient against failed insertions. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
b651056897 Bug 1016611 - Part 4: fix testBookmarksPanel. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
91819f420f Bug 1016611 - Part 3: basic thread safety in GeckoProfile. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
b785e23e06 Bug 1016611 - Part 2: further cleanup. r=margaret 2014-06-20 07:41:04 -07:00
Richard Newman
747fa3ed5e Bug 1016611 - Part 1: don't process distribution files for webapp profiles. r=margaret 2014-06-16 16:07:43 -07:00
Brian Nicholson
9b0ca6c46e Bug 1027139 - Fix ArrowPopup positioning for anchors on right side of screen. r=margaret 2014-06-19 14:30:17 -07:00
Brian Nicholson
8445296f17 Bug 1024127 - Popup cleanup. r=margaret 2014-06-19 14:30:16 -07:00
Ed Morley
632b40c1f3 Merge mozilla-central and fx-team 2014-06-24 17:24:53 +01:00
Paolo Amadini
1bf8822d60 Bug 1023484 - Improvements and test for the initial requestAutocomplete stub. r=MattN
--HG--
rename : toolkit/components/formautofill/AutofillController.js => toolkit/components/formautofill/FormAutofillContentService.js
rename : toolkit/components/formautofill/nsIAutofillController.idl => toolkit/components/formautofill/nsIFormAutofillContentService.idl
2014-06-24 12:15:02 +01:00
Martyn Haigh
bf14086070 Bug 974578 - Prevent broadcast receiver from being unregistered twice. r=myk 2014-06-24 13:15:00 +02:00
Nick Alexander
ecdfcad2b1 Bug 1014247 - Build omni.ja from within Eclipse. r=rnewman 2014-06-24 19:14:36 -07:00
Nick Alexander
d08d854dc8 Bug 1029232 - Part 2: Include rather than reference Fennec Eclipse resources. r=trivial 2014-06-24 19:14:35 -07:00
Nick Alexander
d20f3b96ce Bug 1029232 - Part 1: Reference generated Java sources correctly. r=trivial 2014-06-24 19:14:34 -07:00
Wes Kocher
9b4a34f281 Merge m-c to fx-team a=merge 2014-06-24 18:51:01 -07:00
Nick Alexander
0ec4859e6a Bug 929865 - Part 4: Move WebApps to webapp.Webapps; rename WebApp<n> to Webapp<n>. r=myk
--HG--
extra : rebase_source : c16aae95aae1145907a4b40d48256f5e9bbaa516
2014-06-24 18:20:14 -07:00
Nick Alexander
2b8c71ecb4 Bug 929865 - Part 3: Replace org.mozilla.gecko.App with BrowserApp. r=bnicholson
--HG--
extra : rebase_source : 261ac97c97d3f30ead5abcdd61034c38084e491b
2014-06-24 18:20:13 -07:00
Nick Alexander
88a5f633f1 Bug 929865 - Part 2: Use <activity-alias> to wrap activities in generated namespace. r=bnicholson,myk
--HG--
rename : mobile/android/base/App.java.in => mobile/android/base/App.java
rename : mobile/android/base/Webapp.java.in => mobile/android/base/Webapp.java
extra : rebase_source : 176139e89facd5e96cff25dd4012c4e269d4a0a0
2014-06-24 18:20:13 -07:00
Nick Alexander
bba60d3bbc Bug 929865 - Part 1: Reference org.mozilla.gecko directly when handling application/webapp intent. r=myk
--HG--
extra : rebase_source : 093bfcf485bbd4844c3c9a426bb756aef20fdae8
2014-06-24 18:20:12 -07:00
Martyn Haigh
1bbabd4878 Bug 1007112 - Add default mime type for pick action if unspecified. r=myk 2014-06-23 10:47:00 -04:00
Shashank Sabniveesu
1ba1f28ccf Bug 949902 - Correct "Up to" strings in Bookmarks View, deleted unused icons, and update tests. r=lucasr 2014-06-18 19:31:00 -04:00
Sid Stamm
ed2555fe27 Bug 949533 - Remove uses of x-content-security-policy and pre-spec-compliant parsing/enforcement (file changes). r=jst,grobinson
--HG--
extra : rebase_source : 0be7ad6dc09ef5b6c273748af87503b7c0d19d5b
2014-06-25 12:07:37 -07:00
Blake Kaplan
5ff53bf490 Bug 949617 - Make the login manager work in e10s. r=dolske
--HG--
extra : rebase_source : 412da12f3c916a2e57092943096a15b2c38955e7
extra : histedit_source : 030de4e9454cd4c150126fdb7500ab27023ad244
2014-06-24 16:57:39 -04:00
Ryan VanderMeulen
19f423c800 Merge m-c to inbound. 2014-06-23 10:57:40 -04:00
Geoff Brown
286503bb8e Bug 946656 - Disable testAboutHomeVisibility on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
aec043954c Bug 1028929 - Disable testDoorHanger on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
568520b42e Bug 836818 - Disable testOverscroll on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
913c281817 Bug 945395 - Disable testSessionOOMSave on Android 2.3; r=me 2014-06-23 08:35:52 -06:00
Kartikaya Gupta
ba83c919c7 Bug 1021085 - Fix up the Fennec code path as well. r=Cwiiis 2014-06-23 08:42:53 -04:00
Danny Chen
5da0ecc75e Bug 1005031 - Video controls are displayed in the middle of the video. r=wesj 2014-06-19 13:28:00 +02:00
Ed Morley
7dd2371081 Merge mozilla-central and fx-team 2014-06-19 17:20:10 +01:00
Ed Morley
ff723affc4 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-19 15:59:56 +01:00
Brad Lassey
6e171f4294 bug 1027634 - crash in java.net.MalformedURLException: Unknown protocol: textstyle at java.net.URL.<init>(URL.java) r=snorp 2014-06-19 10:33:24 -04:00
Margaret Leibovic
0ee89f0163 Bug 1018432 - Add telemetry for "+" button in tabs tray. r=mfinkle 2014-06-19 08:37:33 -04:00
Margaret Leibovic
f9d4fa0ba8 Bug 1023331 - Telemetry for three-dot menu in tabs tray. r=mfinkle 2014-06-19 08:37:33 -04:00
Margaret Leibovic
2820a0c27a Bug 817716 - (Part 2) Add 3-dot menu for tabs tray on tablets. r=bnicholson 2014-06-19 08:37:33 -04:00
Margaret Leibovic
df30eb4d18 Bug 817716 - (Part 1) Add 3-dot menu to tabs panel, including a "close all tabs" option. r=bnicholson 2014-06-19 08:37:32 -04:00
Richard Newman
6214106162 Bug 1020412 - Proper handling of Context in GeckoNetworkManager. r=wesj 2014-06-18 09:50:31 -07:00
Geoff Brown
9932d4b45a Bug 995696 - Wait for Content:PageShow after adding tab in testNewTab; r=snorp 2014-06-18 20:39:33 -06:00
Birunthan Mohanathas
ec8396a564 Bug 1016240 - Exterminate CR+LF line endings. r=briansmith,cpearce,ehsan,gavin 2014-06-18 17:56:02 -07:00
Shashank Sabniveesu
f755bde7e2 Bug 1024120 - Create new member to hold Rect object. r=lucasr 2014-06-12 14:04:00 -04:00
Nicholas Nethercote
39f29c384a Bug 1010064 - Allow memory reports to be anonymized. r=bsmedberg.
--HG--
extra : rebase_source : 5eb756b17a97e751deb0f47e909fdb35533cb23b
2014-05-20 23:06:54 -07:00
Geoff Brown
08d9b4d61f Bug 986164 - Provide fake robocop share handlers for images and enable testPictureLinkContextMenu on Android 2.3; r=snorp 2014-06-17 17:34:02 -06:00
Ryan VanderMeulen
deaae864eb Merge m-c to mozilla-inbound. a=merge 2014-06-17 15:43:06 -04:00