Commit Graph

13620 Commits

Author SHA1 Message Date
Brad Lassey
e0d05127b0 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
f971e62aa1 Merge m-c to inbound a=merge 2014-06-25 18:39:25 -07:00
Wes Johnston
bd62408979 Bug 1018468 - Add fullscreen button to video controls. r=mfinkle 2014-06-11 10:25:18 -07:00
Chenxia Liu
00ffc42e71 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
56bde994f7 merge fx-team to mozilla-central a=merge 2014-06-25 15:34:21 +02:00
Jim Blandy
b6b202b6bb 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
8142f96ccb Bug 979600 - Disable testSessionOOMRestore on Android 2.3 (for aws); no review 2014-06-24 20:33:31 -06:00
Geoff Brown
37d69a3ffe Bug 995696 - Disable testNewTab on Android 2.3 (for aws); no review 2014-06-24 20:33:31 -06:00
Wes Kocher
934a0b53a3 Merge m-c to inbound a=merge on a CLOSED TREE 2014-06-24 18:39:27 -07:00
Wes Kocher
60d5bc4f5e Merge inbound to m-c a=merge 2014-06-24 18:13:38 -07:00
Nathan Froyd
944043708f Bug 728600 - define TARGET_XPCOM_ABI in mozilla-config.h; r=glandium 2014-06-23 15:06:48 -04:00
Ed Morley
ca7d53fbb2 Merge mozilla-central and inbound 2014-06-24 17:18:28 +01:00
Ed Morley
1b7a40bcf6 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-24 17:02:56 +01:00
Wes Kocher
eea3b3a418 Merge m-c to fx-team a=merge 2014-06-23 19:07:22 -07:00
Wes Kocher
7b66a28e6b Merge fx-team to m-c a=merge 2014-06-23 17:56:11 -07:00
Margaret Leibovic
5407cb80f9 Bug 1026715 - Add "Open all" item to recent tabs lists. r=lucasr 2014-06-23 14:13:05 -07:00
Michael Comella
869329177b Bug 1002303 - Part 3: Update empty private tabs panel description. r=eedens 2014-06-23 11:35:03 -07:00
Ethan Pransky
d860e50bbf Bug 1019009 - Make MatrixBlobCursor complain if its Cursors are not properly closed. r=gcp 2014-06-24 17:32:28 +02:00
Michael Comella
026e90168e Bug 1028337 - Fix crash when closing all private tabs. r=margaret 2014-06-23 11:01:37 -07:00
Michael Comella
6bbe93ce85 Bug 979600 - Increase verifyPageTitle wait timeout. r=gbrown 2014-06-23 10:54:57 -07:00
Gian-Carlo Pascutto
52b278ac5b Bug 1018928 - Fix getUserMedia device selection on Android. r=blassey 2014-06-24 10:22:50 +02:00
Kartikaya Gupta
6372a34da2 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
aaaea4bda9 Bug 1004850 - (Part 7) Update robocop tests to account for new panel. r=mcomella 2014-06-22 16:26:50 -04:00
Margaret Leibovic
b011882dae Bug 1004850 - (Part 6) Add HomeConfigPrefsBackend migration to add recent tabs panel. r=lucasr 2014-06-22 16:26:50 -04:00
Margaret Leibovic
89813fae07 Bug 1004850 - (Part 5) Add recently closed tabs to RecentTabsPanel. r=lucasr,bnicholson 2014-06-22 16:26:49 -04:00
Margaret Leibovic
c9ee37934b Bug 1004850 - (Part 4) Update RecentTabsAdapter to be a MultiTypeCursorAdapter. r=lucasr 2014-06-22 16:26:49 -04:00
Margaret Leibovic
0ab2b56533 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
2cce4027bb 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
793bdb25ac Bug 1004850 - (Part 1) Replace HistoryPanel with MostRecentPanel. r=lucasr 2014-06-22 16:26:48 -04:00
Nick Alexander
9c0503d0d1 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
318c27b1af 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
bc5d564ba1 Bug 1022748 - Part 1: Pass extras through Accounts.launchSetup. r=rnewman 2014-06-22 12:01:15 -07:00
Nick Alexander
981b5e8a09 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
f901a99bf9 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
57a042d898 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
ca3bef62dd Bug 1023451 - Part 2: apply basic heuristics for locale usability. r=mcomella 2014-06-20 14:31:53 -07:00
Richard Newman
4d7788d281 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
a17c52e46d Bug 1028004 - UI Telemetry events with null methods are ignored r=rnewman 2014-06-20 13:39:33 -04:00
Hathibelagal A
a8275936e2 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
ab948ac9df Bug 1016611 - Part 5: be resilient against failed insertions. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
98ea2ea0e6 Bug 1016611 - Part 4: fix testBookmarksPanel. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
07068f5511 Bug 1016611 - Part 3: basic thread safety in GeckoProfile. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
d9e4fb050c Bug 1016611 - Part 2: further cleanup. r=margaret 2014-06-20 07:41:04 -07:00
Richard Newman
45182e63eb Bug 1016611 - Part 1: don't process distribution files for webapp profiles. r=margaret 2014-06-16 16:07:43 -07:00
Brian Nicholson
3cdc7fc716 Bug 1027139 - Fix ArrowPopup positioning for anchors on right side of screen. r=margaret 2014-06-19 14:30:17 -07:00
Brian Nicholson
a7539380eb Bug 1024127 - Popup cleanup. r=margaret 2014-06-19 14:30:16 -07:00
Ed Morley
a3397ec842 Merge mozilla-central and fx-team 2014-06-24 17:24:53 +01:00
Paolo Amadini
b5f612f085 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
5cf0d70837 Bug 974578 - Prevent broadcast receiver from being unregistered twice. r=myk 2014-06-24 13:15:00 +02:00
Nick Alexander
97dae57493 Bug 1014247 - Build omni.ja from within Eclipse. r=rnewman 2014-06-24 19:14:36 -07:00
Nick Alexander
f5f28bb8de Bug 1029232 - Part 2: Include rather than reference Fennec Eclipse resources. r=trivial 2014-06-24 19:14:35 -07:00
Nick Alexander
53c1c3f6eb Bug 1029232 - Part 1: Reference generated Java sources correctly. r=trivial 2014-06-24 19:14:34 -07:00
Wes Kocher
6e900c14de Merge m-c to fx-team a=merge 2014-06-24 18:51:01 -07:00
Nick Alexander
88f1541f2a 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
15064f9f18 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
5baad386f2 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
ea224e366b 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
1712312d43 Bug 1007112 - Add default mime type for pick action if unspecified. r=myk 2014-06-23 10:47:00 -04:00
Shashank Sabniveesu
ebd0acf4f2 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
a08dda43a7 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
7ea79fde2b 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
2872d3530d Merge m-c to inbound. 2014-06-23 10:57:40 -04:00
Geoff Brown
983e400ef2 Bug 946656 - Disable testAboutHomeVisibility on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
e68bcc54e3 Bug 1028929 - Disable testDoorHanger on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
a6a963eda3 Bug 836818 - Disable testOverscroll on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
04c0275600 Bug 945395 - Disable testSessionOOMSave on Android 2.3; r=me 2014-06-23 08:35:52 -06:00
Kartikaya Gupta
937ee7bc80 Bug 1021085 - Fix up the Fennec code path as well. r=Cwiiis 2014-06-23 08:42:53 -04:00
Danny Chen
ea33d76d00 Bug 1005031 - Video controls are displayed in the middle of the video. r=wesj 2014-06-19 13:28:00 +02:00
Ed Morley
07c4fc7b98 Merge mozilla-central and fx-team 2014-06-19 17:20:10 +01:00
Ed Morley
d8e21cbea6 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-19 15:59:56 +01:00
Brad Lassey
250cbec5d5 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
7e0950e8da Bug 1018432 - Add telemetry for "+" button in tabs tray. r=mfinkle 2014-06-19 08:37:33 -04:00
Margaret Leibovic
ce5b8499b9 Bug 1023331 - Telemetry for three-dot menu in tabs tray. r=mfinkle 2014-06-19 08:37:33 -04:00
Margaret Leibovic
98db51f588 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
96f32b7a7c 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
29a2d597b9 Bug 1020412 - Proper handling of Context in GeckoNetworkManager. r=wesj 2014-06-18 09:50:31 -07:00
Geoff Brown
af655ae823 Bug 995696 - Wait for Content:PageShow after adding tab in testNewTab; r=snorp 2014-06-18 20:39:33 -06:00
Birunthan Mohanathas
c910458886 Bug 1016240 - Exterminate CR+LF line endings. r=briansmith,cpearce,ehsan,gavin 2014-06-18 17:56:02 -07:00
Shashank Sabniveesu
5c5c61a9ad Bug 1024120 - Create new member to hold Rect object. r=lucasr 2014-06-12 14:04:00 -04:00
Nicholas Nethercote
bb9d51e11e 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
d6830aed9b 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
469ca0e66b Merge m-c to mozilla-inbound. a=merge 2014-06-17 15:43:06 -04:00
Mark Finkle
5b8a4c128d Bug 1026347 - Session:Prefetch should watch for empty nsIURI.host r=bnicholson 2014-06-17 09:52:37 -04:00
Ed Morley
65d01ba6c2 Backed out changeset 4ff51fc48fa3 (bug 1026347) for causing all android tests to fail; CLOSED TREE 2014-06-17 15:57:08 +01:00
Boris Zbarsky
632d59fe2d Bug 1019194 part 1. Get rid of nsIIndexedDatabaseManager. r=paul,khuey,mossop 2014-06-17 15:01:47 -04:00
vivek
c840287bfe Bug 999211 - Implement cancel editing mode button test on tablet. r=mcomella 2014-06-14 11:49:00 -04:00
Mark Finkle
e2bb8054b3 Bug 1026347 - Session:Prefetch should watch for empty nsIURI.host r=bnicholson 2014-06-17 09:52:37 -04:00
Lucas Rocha
797d3b3830 Bug 964861 - Don't update the toolbar state before it gets attached (r=bnicholson) 2014-06-17 14:29:31 +01:00
Carsten "Tomcat" Book
f72b2aa35a merge fx-team to mozilla-central a=merge 2014-06-17 14:09:46 +02:00
Mark Finkle
fd0052dd62 Bug 1018430 - UI telemetry actions for web page context menu r=liuche 2014-06-17 00:20:10 -04:00
Mark Finkle
f855382f3c Bug 1026003 - UI telemetry for opening pages in new tabs from web content contextmenu r=liuche 2014-06-17 00:20:06 -04:00
Wes Kocher
ac9ccabce7 Backed out changeset 62cce2cf895f (bug 1016611) for causing Android bustage on a CLOSED TREE 2014-06-16 17:41:28 -07:00
Richard Newman
ba98de30fd Bug 1025937 - Silently drop null intents in background IntentServices. r=mcomella 2014-06-16 16:18:59 -07:00
Richard Newman
92dec37a4c Bug 1016611 - Don't process distribution files for webapp profiles. r=margaret 2014-06-16 16:07:43 -07:00
Geoff Brown
efa6723c0b Bug 979603 - Enable robocop testBrowserProvider on Android 2.3; r=me 2014-06-16 13:16:59 -06:00
Geoff Brown
f8a6a64c38 Bug 983440 - Allow for NoSuchMethodException thrown from getDeclaredField, pre-Honeycomb; r=jchen 2014-06-16 13:16:58 -06:00
Jim Chen
c8b355cd23 Bug 1011059 - Use editor rather than selection controller to select all; r=margaret 2014-06-16 11:54:57 -04:00
Jim Chen
418c4d6dfa Bug 1011059 - Don't remove all ranges when selecting; r=margaret 2014-06-16 11:54:56 -04:00
Mark Finkle
b0dc68af54 Bug 1007215 - Update telemetry docs for Casting actions r=liuche 2014-06-13 23:39:05 -04:00
Mark Finkle
b1e7f814b1 Bug 1007215 - Add UI telemetry for Casting actions r=liuche 2014-06-13 22:33:40 -04:00