Commit Graph

13580 Commits

Author SHA1 Message Date
Franz Sarmiento
235c8e0d6e Bug 1028728 - Update findListViewWithTag consumers to use strings from HomePager. r=mcomella 2014-06-24 21:41:00 -04:00
Brad Lassey
d8237902de bug 1030743 - NullPointerExceptions in GeckoPreferences r=rnewman 2014-06-26 09:48:23 -04:00
Brad Lassey
9c96ad0756 bug 1030738 - NullPointerException when getting action bar r=rnewman 2014-06-26 09:41:42 -04:00
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
Randall Barker
59d2b741db Bug 1031000 - Fix problem with TabSource Prompt. r=blassey 2014-06-26 14:21:00 +02:00
Nick Alexander
0366895e38 Bug 1030734 - Fix BROWSER_INTENT_{PACKAGE,CLASS} in background after Bug 929865. r=rnewman 2014-06-26 18:57:32 -07:00
Richard Newman
3d7024e886 Bug 1030740 - Add return statements inadvertently omitted from Bug 1025937. r=mcomella 2014-06-26 09:48:48 -07:00
Carsten "Tomcat" Book
1098f66f03 Merge mozilla-central to fx-team 2014-06-26 15:53:44 +02:00
Carsten "Tomcat" Book
9c954f17e2 merge fx-team to mozilla-central a=merge 2014-06-26 15:33:24 +02:00
Shashank Sabniveesu
d52df17bc9 Bug 1026010 - Rename GeckoApp.ACTION_BOOKMARK to ACTION_HOMESCREEN_SHORTCUT. r=lucasr 2014-06-25 09:10:00 -04:00
Eric Edens
3a24ad1f86 Bug 881091 - Don't set byline if byline is too long. r=lucasr 2014-05-16 11:03:49 -07: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