Граф коммитов

19817 Коммитов

Автор SHA1 Сообщение Дата
Carsten "Tomcat" Book 3ce084784c Merge mozilla-central to mozilla-inbound 2016-04-12 13:53:14 +02:00
Carsten "Tomcat" Book 128f40b9a8 merge mozilla-inbound to mozilla-central a=merge 2016-04-12 13:49:51 +02:00
Michael Comella 20d795e8ee Bug 1263758 - Correct NPE when using a custom search engine as the default r=liuche
MozReview-Commit-ID: hpGUIu9yP2

--HG--
extra : rebase_source : 028039ffdff3f73eaed3118ba9b96408b62c6858
2016-04-11 16:10:48 -07:00
Chenxia Liu 6717eb25fa Bug 1260321 - Follow-up: Migrate users with customized panels to combined history panel. r=sebastian
MozReview-Commit-ID: 6SQ7nuZhCe0

--HG--
extra : rebase_source : ff5ad2b022c2b13b3fa9ed5d3e0512ad9f60a63e
2016-04-04 21:47:19 -07:00
Wes Kocher fb4ea9c4bc Merge m-c to fx-team, a=merge
MozReview-Commit-ID: aMZh9ToTxW
2016-04-11 16:05:35 -07:00
Geoff Brown 22f9dbec3f Bug 1247468 - Increase timeout for testBookmarklets; r=margaret 2016-04-11 11:31:33 -06:00
Andrzej Hunt c3109ede31 Bug 1261907 - Reintroduce (necessary) table-created checks in BrowserDatabaseHelper r=nalexander
Removing these checks causes crashes when trying to upgrade a <= 17 db to >= 23:
(A) upgradeDatabaseFrom17to18 calls createReadingListTable, and we create the table using the new (>=23 schema).
    This schema has no "read" column.
(B) upgradeDatabaseFrom22to23 migrates the same table. As part of the migration it tries to select the "read"
    column, and we crash because that doesn't exist. This was prevented by an early return if didCreateReadingListTable
    was set.

It looks like removing the didCreateTablsTable checks is OK because the migration only adds a foreign-key constraint,
and doesn't depend on any columns that didn't exist in the initial version of the migration. However it seems wasteful
to run the migration on a table that is already in the expected state. Moreover not having table-created checks is
not safe in most cases, and having these checks should be the default pattern - especially in case any future migrations
affecting the same table are added.

MozReview-Commit-ID: 4j1PlQc6LLN

--HG--
extra : rebase_source : c1811061ac3448666730426b353941bfe3d4814e
2016-04-08 15:29:44 -07:00
Michael Comella 30b5fa7d3a Bug 1246792 - Use existing constant for times.json. r=ahunt
MozReview-Commit-ID: ACtIOPiOSfs

--HG--
extra : rebase_source : efb16e791e333280a3f973fc25b09bb361fcc3bd
2016-04-06 13:26:28 -07:00
Andrzej Hunt 82297987a5 Bug 1205124 - use AppCompatActivity for GeckoPreferences r=sebastian
This patch introduces consistent theming for all supported devices (Android 4+).
Previously we had Jellybean theming on Android 4, and Lollipop theming on 5+.

Note that dialogs will be based on the native device dialogs (i.e. Jellybean on 4,
Lollipop on 5+). This is because we use native Fragments (and not support library
Fragments), which inflate their own (native) Dialogs. Introducing consistent
dialogs would involve replacing the use of native Fragments (and native
PreferenceFragments), and replacing our self-inflated dialogs.

(We have a few self-built dialogs - these could easily be switched to the AppCompat
 AlertDialog, but then we'd have a mix of new and old dialogs on Android 4 devices,
 since PreferenceFragment constructed dialogs would still be the native Android
 dialogs - overall this would be a worse experience.)

It is also usable on 2.3. There, we retain GB theming, however the checkboxes
are replaced with orange checkboxes (as on 4+).

MozReview-Commit-ID: AXbyAfpvfKi

--HG--
extra : rebase_source : 2b80c8f2beb7939e1f556e91bca87b60ebe4368e
2016-03-28 14:32:07 -07:00
Chenxia Liu 9322f434ca Bug 1262600 - crash in java.lang.IndexOutOfBoundsException: Invalid index -1, size is 13 at java.util.ArrayList.throwIndexOutOfBoundsException(ArrayList.java). r=sebastian
MozReview-Commit-ID: 4H8fqxaR9mO

--HG--
extra : rebase_source : 4c06f3ecc0879d688ae63f5da8564cc88e8371f5
2016-04-07 15:14:54 -07:00
johndai1984 4c64e194f9 Bug 682294 - Add an error page for file access denied. r=bz 2016-04-06 08:18:00 +02:00
Junior Hsu 926d8aa917 Bug 1148307 - Part 3, implement session transport with DataChannel. r=jib.
--HG--
extra : rebase_source : 821a3fae4c6146d77d2e714e14e5eb9316f39e67
2016-04-11 11:20:55 +08:00
Kartikaya Gupta ad71ab8eb2 Bug 1259735 - Guard against a rounding error that could lead to Java having a stale page size, rendering the page unscrollable. r=snorp
MozReview-Commit-ID: 8s3zmH0LhmU

--HG--
extra : rebase_source : fc1a23eddb188907085265f000573f8b0578581a
2016-04-07 08:59:14 -04:00
Michael Comella b2afa76ae0 Bug 1239376 - Fix StrictMode thread read access in SysInfo.getMemSize. r=mfinkle
This caused a StrictMode violation on startup.

MozReview-Commit-ID: Ip2ywUoexOh

--HG--
extra : rebase_source : 12bb7cc010b82a03f80f8c1b9a01e9acbf67c13c
extra : source : faa74a9297c8476f965a5f9268d5b9095458dd2b
2016-01-27 12:06:33 -08:00
Jan Henning 92d36d5a63 Bug 1262565 - Replace usage of timeouts in session store form data test with waiting for appropriate events. r=margaret
MozReview-Commit-ID: 55WuGx5P98c

--HG--
extra : transplant_source : %ACT%EEhx%BAoJKb%9D2%85%24%BB%F9%85%B4%91%F7
2016-04-06 22:32:52 +02:00
Ryan VanderMeulen 192023f221 Merge m-c to fx-team. a=merge 2016-04-09 10:09:49 -04:00
Wes Kocher b6d0503738 Merge fx-team to central, a=merge
MozReview-Commit-ID: yuSA0kqs0F
2016-04-08 15:26:49 -07:00
Carsten "Tomcat" Book a0247db7af merge mozilla-inbound to mozilla-central a=merge 2016-04-08 12:00:31 +02:00
Nick Alexander 2f5e25c629 Bug 1262890 - Don't require Android NDK for Gradle dependencies build. r=mcomella
MozReview-Commit-ID: 44sw2qDN76s

--HG--
extra : rebase_source : 3e0eb3682c232af2904dc5651e44b4065cce7e83
2016-04-07 10:18:22 -07:00
Mark Capella 7fad4e451f Bug 1218955 - Remove nsIMEPicker, r=jchen 2016-04-07 21:30:07 -04:00
Michael Comella 0f28c86709 Bug 1261965 - Correct potential NullPointerException in FilePickerResultHandler. r=grisha
MozReview-Commit-ID: 7a8jV4vRCH2

--HG--
extra : rebase_source : 6c9dcbc1ca9c5954a93423bc1735f32f9f808cff
2016-04-05 16:09:44 -07:00
Michael Comella 2e192cd78c Bug 1261965 - Correct leak FileOutputStream in FilePickerResultHandler. r=grisha
MozReview-Commit-ID: 6gfRS4SPM8E

--HG--
extra : rebase_source : 8dcad3fb239e17b6d348209b08fd2748411de2f2
2016-04-04 14:51:11 -07:00
Andrzej Hunt fefbe2ce4e Bug 1257345 - Implement reading list smartfolder r=mcomella
MozReview-Commit-ID: 7AuWRAZ7Sq5

--HG--
extra : rebase_source : 9121c1254264c97da433dc2bc1c5bcd48498c97d
extra : histedit_source : 5bee1e9bf2c05a2624cf647f8f625eaaff019bcc
2016-04-07 14:30:16 -07:00
Andrzej Hunt 53b353fa8a Bug 1234319 - Post: purge ReadingListAccessor and ReadingListProvider r=mcomella
MozReview-Commit-ID: 1JcJKqBzP48

--HG--
extra : rebase_source : e73b5189cd886c1e5a74941a66cef3a624d4b0fa
extra : histedit_source : ad61f153fbdc2f647f6a31e3a23427ef119fd212
2016-03-24 13:16:34 -07:00
Michael Comella 5396926b28 Bug 1263056 - Add TODO for CAST check in WhitespaceAfter. r=sebastian
MozReview-Commit-ID: 5ZRSnGylCnJ

--HG--
extra : rebase_source : a88bed32638ef44b93b8ba9d1682793588593614
2016-04-07 18:23:54 -07:00
Michael Comella 70a0ef8e25 Bug 1263056 - Add WhitespaceAfter comma & fix issues. r=sebastian
Fixed via:
 gsed -i"" -e "s/,\([^[:space:]\"']\)/, \1/g" **/*.java

And hand curation.

MozReview-Commit-ID: DHaXJbW4plY

--HG--
extra : rebase_source : fc708f6fac7b7245a1da6541c4ff44d8e231b879
2016-04-07 18:07:29 -07:00
Michael Comella f397cb45d3 Bug 1263056 - Add WhitespaceAfter for semi-colons & fix warnings. r=sebastian
MozReview-Commit-ID: FWujl1XuxgR

--HG--
extra : rebase_source : 106f9ce8ec75d024ccb68af95129f1ef6f08de16
2016-04-07 17:53:55 -07:00
Margaret Leibovic 45c6259c25 Bug 1262896 - Add utm_source parameters to default bookmarks. r=sebastian
MozReview-Commit-ID: 1Ae7JAcR89s

--HG--
extra : rebase_source : 619d064de7428596f5cd4c4f0152b2813586c7bf
2016-04-07 14:01:49 -04:00
Andrzej Hunt 4fd55c90c0 Bug 1234319 - Post: Don't track or care about the reading list in Tabs r=mcomella
MozReview-Commit-ID: Ex89J6QLmrI

--HG--
extra : rebase_source : 8fe6d923e4ba6f2382a5c68643308e2ec8032193
extra : histedit_source : 311ae85948fe36e75d1ffcf54b5296ad8e110b96
2016-03-08 09:31:15 -08:00
Andrzej Hunt dd571127b9 Bug 1234319 - Post: cleanup/remove OnReadingListEventListener r=mcomella
MozReview-Commit-ID: 5mSmqPQk744

--HG--
extra : rebase_source : eab0d5b984f757f9ab858dfa4a46adf28b12ef55
extra : histedit_source : 3f95ffa5391d9d2aa1ab675db44d794ab0cc410c
2016-03-08 09:15:43 -08:00
Andrzej Hunt a4aab136c3 Bug 1234319 - Remove reading list button from main menu r=mcomella
MozReview-Commit-ID: AlvSssy8hLc

--HG--
extra : rebase_source : 613c12dd43c28e2fa913c7830bd51423d77beec5
extra : histedit_source : 4d1e7b98d60729f3585cabbfccc8920863842dfc
2016-03-25 16:09:04 -07:00
Andrzej Hunt bb4cfdaa22 Bug 1240728 - Post: cleanup / remove AddToReadingList from OverlayActionService r=mcomella
MozReview-Commit-ID: 3aUoXhfKYBP

--HG--
extra : rebase_source : bf6f10c2d7006bbcd9c03156f5036f0c77300a62
extra : histedit_source : 6f0ca5f06c0a4988e16102ff6d237070239198ee
2016-03-25 16:11:37 -07:00
Andrzej Hunt c43374ae25 Bug 1240728 - Remove add to reading list from the share overlay r=mcomella
String resources are shared with the main app menu, and will therefore be remove
in Bug 1234319 which aims to remove those items.

MozReview-Commit-ID: 1NUBskBC10l

--HG--
extra : rebase_source : 579955aa6f10322a57105947a0b25065dbe92c55
extra : histedit_source : d09a951b2e661d80c8270dc12f0c08cc1eb62930
2016-03-08 09:34:28 -08:00
Andrzej Hunt 03976ef545 Bug 1246232 - Remove "add to reading list" from link-long-press context menu r=liuche
MozReview-Commit-ID: COprGdVgKOf

--HG--
extra : rebase_source : 461d794730671dd5dbdf357d2d827e67a330d9be
extra : histedit_source : 1fba82a6fe3c86fce774ea41209de1af255ee11e
2016-03-07 15:33:23 -08:00
Andrzej Hunt 56bfa269f8 Bug 1234316 - Post: cleanup unneeded reading list resources/strings r=liuche
MozReview-Commit-ID: C2Zei1AabQ9

--HG--
extra : rebase_source : 11a3f24f96cdbd050b9806838d297ab59ac80e0d
extra : histedit_source : 8e884fb29f2febfa339728df42227db53355091a
2016-03-08 15:12:05 -08:00
Andrzej Hunt e6bc80d658 Bug 1234316 - Post: remove unused ReadingListRow and related styles r=liuche
MozReview-Commit-ID: DVqsyMDEoBq

--HG--
extra : rebase_source : 6ae2b84846a7e9b4d6e0ee5e42868904a4ed99e6
extra : histedit_source : ae05732d70a0bd77e3f9f5bef99adbc0782ad050
2016-03-17 14:37:31 -07:00
Andrzej Hunt 276f80ad5d Bug 1234316 - Post: remove reading list read/unread items from homepanel context menu r=liuche
MozReview-Commit-ID: DPOc8TyUFVv

--HG--
extra : rebase_source : 68d470f540467114119037ad25306ac0bb829273
extra : histedit_source : 466560fadde34a31ffe9533f8c88f11195260991
2016-03-24 13:19:14 -07:00
Andrzej Hunt fd701c6b5d Bug 1234316 - Show migration message in Reading List panel r=liuche
We'll kill this panel in a few weeks, hence we don't really care about
duplication here.

MozReview-Commit-ID: 5XSS3ROa5P3

--HG--
rename : mobile/android/base/resources/layout/firstrun_sync_fragment.xml => mobile/android/base/resources/layout/readinglistpanel_gone_fragment.xml
extra : rebase_source : ce339a412d248a51c8d9cf5250a7b91b3876f711
extra : histedit_source : 481e705dc0a75d92e166ff0a5a27206189d4a8f0
2016-03-24 13:29:47 -07:00
Andrzej Hunt 5a6a599aea Bug 1234328 - Show "switch to tab" for readercached items too r=sebastian
We will already switch to the currently open tab, so we need to ensure we
show the "switch to tab" indicator.

MozReview-Commit-ID: 9q1kDM2flSi

--HG--
extra : rebase_source : 6fddaf7da9de4ea5944e4b7c1c5ff43738cce218
extra : histedit_source : 4f2e57c2ce178aecd80a04b1e842b0e2b29b0ac2
2016-03-17 14:39:42 -07:00
Andrzej Hunt 465a53cb2f Bug 1234328 - Open readercached items into readermode r=sebastian
MozReview-Commit-ID: IcQTgvsmGYl

--HG--
extra : rebase_source : 5e6fe370b056384ade01c2df0956bf8a23f77834
extra : histedit_source : d4cc14210a4ee539c37853abec74de784f6c99d8
2016-03-29 20:00:09 -07:00
Andrzej Hunt 94b8eddcbf Bug 1234328 - Add readercache icon to TwoLinePageRow r=sebastian
This means we can see the readercache availability not only inside bookmarks, but also
in most other parts of the awesomescreen, since we use TwoLinePageRow for most items
(history, bookmarks, topsites, search results etc).

MozReview-Commit-ID: 8SxE8VabIK9

--HG--
extra : rebase_source : b06d945cbe31b93e21c3a171f53cc9f6143de8d8
extra : histedit_source : ab8eab075e3fc6123f9694561140e306df5375db
2016-03-29 20:07:06 -07:00
Andrzej Hunt e06f68ea0a Bug 1234331 - Remove from readercache when unbookmarking page r=margaret
MozReview-Commit-ID: EaJarGuccBE

--HG--
extra : rebase_source : 3b4531a2246d4c9ef6385b22b3c2f9daefbd48ff
extra : histedit_source : 2f84610b84acd8d79f6d0c281324a1832491a1ba
2016-03-29 20:11:38 -07:00
Andrzej Hunt 6a00381326 Bug 1234331 - Push article into readercache when bookmarking readerview page r=margaret
MozReview-Commit-ID: D7Yy45xkFd8

--HG--
extra : rebase_source : 653ee379315cb9ee9bdc6103547f34282b4f930b
extra : histedit_source : 6577ff825ebfb1cdbd5a8558b3e9666cc071a0ff
2016-03-29 20:08:09 -07:00
Andrzej Hunt 00048b7314 Bug 1234331 - Allow bookmarking readerview pages r=margaret
MozReview-Commit-ID: A9n1IA0d4H8

--HG--
extra : rebase_source : d9461d3b81de38828323878e780faf9bf3d0a501
extra : histedit_source : dcd167fe0a27dec25faa8dec6a75cd33ff9175bb
2016-03-22 13:46:58 -07:00
Andrzej Hunt 49202a1936 Bug 1234315 - Introduce test for url to cache-filename r=nalexander
We hash the page URL to produce a filename for each cached reader view page. For the purposes
of the rl-migration we need a Java implementation, however the canonical implementation
lives in the current JS readercache (which might be removed in future...). This test
should help ensure that we don't lose saved items during the migration.

We could extract getReaderCacheFileNameForURL(), however it seems safer to make it
public instead - this makes it obvious that this is a migration-only method that
shouldn't be modified/reused in future.

MozReview-Commit-ID: GNg20nszMh9

--HG--
extra : rebase_source : 33af7e38fa7e74287515bcf5cf2521978d8978a0
extra : histedit_source : 9fe9fcae7595b450491a0fb482ffdc73b5b6f344
2016-04-04 15:12:04 -07:00
Andrzej Hunt cbbfaa649a Bug 1234315 - Add test for reading-list to bookmarks (30->31) migration r=mcomella
MozReview-Commit-ID: EOKlyTbPD1w

--HG--
extra : rebase_source : a819218a970103867e87b231f47c5a8c72f13744
extra : histedit_source : bec153b86c535dd1e2fc37ee18ed6d3240161d3b
2016-04-08 14:33:55 -07:00
Andrzej Hunt 2f90ba3668 Bug 1234315 - Migrate reading-list table to bookmarks r=rnewman
MozReview-Commit-ID: FkeZFA9ZTp3

--HG--
extra : rebase_source : de2ac9691d9a8551c77d9211554878b816a0c533
extra : histedit_source : 3af717446277cf7f6608ee46963c019ba7fc8e3f
2016-04-07 13:36:42 -07:00
Andrzej Hunt 0441162e7b Bug 1234315 - Introduce SavedReaderViewHelper to track cached reader view items r=nalexander
MozReview-Commit-ID: CcylWpiAA3h

--HG--
extra : rebase_source : 60f2abd7e063b44fab1f668e14b9e62136c523fc
extra : histedit_source : 30a56b5eeb632effa03d3c4f864ef14e97f2f3b1
2016-04-07 14:29:54 -07:00
Andrzej Hunt 07a26672a4 Bug 1234315 - Add reader view to UrlAnnotations r=sebastian
MozReview-Commit-ID: FkErHQxavkV

--HG--
extra : rebase_source : 4d34a3a74f80d557458ca1f448cf15bf93fce190
2016-03-29 20:01:33 -07:00
Jan Henning d80f435b5a Bug 1229259 - Always initialise new tabs with basic session store data. r=margaret
When opening a new tab, there is a small window between tab creation and the DOMTitleChanged event firing where the tab - if it is not created as a delay loaded zombie tab right away - won't have any session store data. However a number of functions (tab zombification and restoring of zombified tabs, undo close tabs) depend on the session store data always being available, so things can fall apart if e.g. a zombification is triggered immediately after opening a new tab.
This also means that a tab which is zombfied immediately after its creation (e.g. when a number of tabs are opened through tab queues on startup) is not included in a session save and will therefore get lost if Firefox is killed.

Therefore, we now always intialise new tabs with some basic session store data.

MozReview-Commit-ID: 9248jJFUaq5

--HG--
extra : transplant_source : %BC%7Ci%20%82%1E7%29%9E%0E7%87%ED-%0B%E0%84%86R%F9
2016-04-07 22:02:05 +02:00