Commit Graph

6946 Commits

Author SHA1 Message Date
Tim Taubert
2366f49f07 merge m-c to elm 2013-10-17 10:51:26 -07:00
Carsten "Tomcat" Book
fc3455fc6c Merge mozilla-inbound to mozilla-central 2013-10-17 13:43:37 +02:00
Richard Newman
d19ec3856e Bug 922694 - Part 7: use standalone prefs to avoid racing with startup. r=ckitching 2013-10-16 19:25:13 -07:00
Richard Newman
32f5c1ee2d Bug 922694 - Part 6: follow-up to fix test. r=nalexander 2013-10-16 18:56:27 -07:00
Richard Newman
b348e9f27d Bug 922694 - Part 5: grab distribution ID in FHR. r=mcomella 2013-10-16 18:56:27 -07:00
Richard Newman
b4fc1fec43 Bug 922694 - Part 4: grab Accept-Locale pref in FHR. r=mcomella 2013-10-16 18:56:27 -07:00
Richard Newman
61877a3c32 Bug 922694 - Part 3: FHR changes for distribution and locale. r=mcomella 2013-10-16 18:56:27 -07:00
Richard Newman
019f744efa Bug 922694 - Part 2: expose distribution ID. r=margaret 2013-10-16 18:56:26 -07:00
Richard Newman
952d0f2ffb Bug 922694 - Part 1: split Distribution class to allow for use from FHR, use buffer when expanding zip contents. r=margaret 2013-10-16 18:56:26 -07:00
Tim Taubert
4f8e76318c merge m-c to elm 2013-10-16 17:42:00 -07:00
Ryan VanderMeulen
5ea6eb0b72 Merge fx-team to m-c. 2013-10-16 17:00:57 -04:00
Tim Taubert
90c78483c7 merge m-c to elm 2013-10-16 10:25:32 -07:00
Michael Comella
2a8f6fb928 Bug 925546: OnPinSiteListener -> OnEditPinnedSiteListener. r=sriram 2013-10-16 10:09:41 -07:00
Chenxia Liu
c9c696a583 Bug 919230 - Implement empty screen state for bookmarks. r=sriram 2013-10-16 09:42:33 -07:00
Jim Chen
daf87424ab Bug 917685 - Catch error thrown by nsILoadContext.associatedWindow; r=mfinkle 2013-10-16 10:51:23 -04:00
Wes Kocher
6667469963 Merge m-c to fx-team 2013-10-15 20:32:13 -07:00
Wes Kocher
d7cf0c4e55 Merge fxteam to m-c 2013-10-15 20:26:55 -07:00
Wes Kocher
bb2827303b Backed out 5 changesets (bug 922694) for Android rc3 orange
Backed out changeset 51185a26a7b7 (bug 922694)
Backed out changeset 3d0582ab0417 (bug 922694)
Backed out changeset d333b85c805d (bug 922694)
Backed out changeset a78a707ba721 (bug 922694)
Backed out changeset 34e48f8bac52 (bug 922694)
2013-10-15 18:32:31 -07:00
Nick Alexander
ab3a3a1144 Fix merge 3. 2013-10-15 16:50:20 -07:00
Richard Newman
01d2703713 Bug 922694 - Part 5: grab distribution ID in FHR. r=mcomella 2013-10-15 16:53:46 -07:00
Richard Newman
63220a1d6c Bug 922694 - Part 4: grab Accept-Locale pref in FHR. r=mcomella 2013-10-15 16:53:45 -07:00
Richard Newman
ec31841303 Bug 922694 - Part 3: FHR changes for distribution and locale. r=mcomella 2013-10-15 16:53:45 -07:00
Richard Newman
f0b32cc864 Bug 922694 - Part 2: expose distribution ID. r=margaret 2013-10-15 16:53:45 -07:00
Richard Newman
feef34a824 Bug 922694 - Part 1: split Distribution class to allow for use from FHR, use buffer when expanding zip contents. r=margaret 2013-10-15 16:53:45 -07:00
Wes Johnston
9323b2ab25 Bug 920170 - Allow adding a grid of icons to prompts. r=margaret 2013-10-15 08:53:16 -07:00
Nick Alexander
02c3f32bc4 Merge m-c to elm 2013-10-15 08:21:01 -07:00
Wes Johnston
0df52d5fd7 Bug 904245 - TWhitespace fixup r=kats 2013-10-15 08:08:10 -07:00
Wes Johnston
f9a93fb4b0 Bug 904245 - Take touch radius into account when calculating pan threshold. r=kats 2013-10-15 08:06:01 -07:00
Sriram Ramasubramanian
4fdacac4f7 Bug 917947: SearchEngine icons are small in the dialog. [r=mfinkle] [r=margaret] 2013-10-14 13:52:23 -07:00
Sriram Ramasubramanian
034d1e1d88 Bug 926574: Use a new constructor for CursorAdapter. [r=mfinkle] [r=lucasr] 2013-10-14 13:34:08 -07:00
Lucas Rocha
5988e3ab6f Bug 927371 - Remove performEmptySearch from SearchLoader (r=sriram) 2013-10-16 17:02:02 +01:00
Lucas Rocha
f89b34487f Bug 918044 - Block layout requests while handling focus changes in TopSitesGridView (r=sriram) 2013-10-16 16:39:34 +01:00
Lucas Rocha
fb9d2304ad Bug 917350 - Enable loading unconditionally in BrowserSearch (r=margaret) 2013-10-16 10:30:40 +01:00
Lucas Rocha
db1ab6bc21 Bug 917350 - Move loader init() implementation to SearchLoader (r=margaret) 2013-10-16 10:30:39 +01:00
Lucas Rocha
09c846ac9e Bug 917350 - Factor out method to create SearchLoader arguments (r=margaret) 2013-10-16 10:30:39 +01:00
Margaret Leibovic
740ae36fdd Bug 925427 - Fix order of search engines in settings page. r=liuche
* * *
Bug 925427 - (Part 2) Clean up SearchPreferenceCategory.handleMessage
2013-10-15 22:02:16 -07:00
Gavin Sharp
8235f4ee2a merge m-c into elm 2013-10-14 13:01:12 -07:00
Nick Alexander
48da05ce81 Merge m-c to elm 2013-10-14 09:05:11 -07:00
Wes Johnston
13fd9e42a0 Bug 923391 - Prompts should return values even if they're cancelled. r=mfinkle 2013-10-15 00:13:13 -07:00
Wes Johnston
cd0eddf863 Bug 920170 - Break out some pieces of prompts into their own methods. r=margaret 2013-10-15 00:11:27 -07:00
Federico Paolinelli
ce68aebd91 Bug 921776 - Forced notifications to keep the same timestamp to preserve the order they are displayed in; fixed current notification mechanism in notification handler to update correctly the current foreground notification; r=wesj 2013-10-14 13:38:57 -07:00
Ryan VanderMeulen
7bda00af37 Merge m-c to fx-team. 2013-10-14 14:44:54 -04:00
Mark Capella
c178a1f5fc Bug 923764 - Intermittent testBookmark | added as a bookmark - got true, expected false, r=lucasr, f=adriant 2013-10-14 14:05:08 -04:00
Chris Kitching
c2d395f5d4 Bug 926497 - Prevent the favicon cache from throwing NPEs at odd moments. r=rnewman 2013-10-14 10:37:03 -07:00
Wes Johnston
e2d1ec1b26 Bug 925538 - Import fireDialogEvent method into FilePicker. r=mfinkle 2013-10-14 09:40:59 -07:00
Phil Ringnalda
482fc23a2c Merge m-i to m-c 2013-10-13 10:18:40 -07:00
Richard Newman
3215154946 Bug 926129 - Follow-up: null check. r=trivial 2013-10-12 22:32:03 -07:00
Nick Alexander
ac30a10636 Fix merge (take 2). 2013-10-12 21:50:38 -07:00
Chris Kitching
bc1ff65cad Bug 926129 - Do LoadFaviconTask result chaining in constant stack space. r=rnewman 2013-10-12 21:23:10 -07:00
Chenxia Liu
80c4d4f806 Bug 914377 - Intermittent testShareLink | Exception caught - junit.framework.AssertionFailedError: View is null and can therefore not be clicked! r=gbrown 2013-10-12 20:32:43 -07:00