Commit Graph

10725 Commits

Author SHA1 Message Date
Phil Ringnalda
2546eef4df Merge m-c to fx-team 2013-09-22 09:16:05 -07:00
Wes Kocher
70902e153a Merge inbound to m-c 2013-09-20 19:28:47 -07:00
Ryan VanderMeulen
c06b89cd15 Merge m-c to fx-team. 2013-09-20 18:19:03 -04:00
Lucas Rocha
d4b0e016fa Bug 917455 - Implement missing getInt() in TopSitesCursorWrapper (r=sriram) 2013-09-20 15:53:04 -04:00
Lucas Rocha
a6b188b047 Bug 917806 - Immediately update title in toolbar on ACTION_VIEW intent (r=margaret) 2013-09-20 15:22:35 -04:00
Margaret Leibovic
f9cfaab2fa merge m-c to fig 2013-09-20 14:50:31 -04:00
Chenxia Liu
9b4736fbb8 Bug 917398 - Include test for new top sites. r=margaret 2013-09-20 13:35:29 -04:00
Chenxia Liu
6995aca43c Bug 917398 - Update tests for the new tabs in about:home. r=margaret 2013-09-20 13:35:29 -04:00
Lucas Rocha
4f5f1505bd Bug 918377 - Remove unnecessary extra touch handling from BookmarksListView (r=sriram) 2013-09-19 17:23:58 -04:00
Lucas Rocha
efb7cd3d7c Bug 918377 - Move and update header divider code to TopSitesPage (r=sriram) 2013-09-19 17:19:43 -04:00
Lucas Rocha
91387b1c7a Bug 918377 - Misc layout fixes on new tab layout in about:home (r=sriram) 2013-09-19 17:19:43 -04:00
Lucas Rocha
2f77bef5ef Bug 918032 - Top Sites query should include display, bookmarkId, historyId (r=wesj) 2013-09-19 17:18:06 -04:00
Lucas Rocha
bed607c9fa Merge m-c to fig
--HG--
rename : mobile/android/base/home/PinBookmarkDialog.java => mobile/android/base/home/PinSiteDialog.java
rename : mobile/android/base/home/TopBookmarksView.java => mobile/android/base/home/TopSitesGridView.java
rename : mobile/android/base/home/MostVisitedPage.java => mobile/android/base/home/TopSitesPage.java
rename : mobile/android/base/home/BookmarkThumbnailView.java => mobile/android/base/home/TopSitesThumbnailView.java
rename : mobile/android/base/resources/color/top_bookmark_item_title.xml => mobile/android/base/resources/color/top_sites_grid_item_title.xml
rename : mobile/android/base/resources/drawable-hdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-hdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-mdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-mdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-xhdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-xhdpi/top_site_add.png
rename : mobile/android/base/resources/drawable/bookmark_thumbnail_bg.xml => mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
rename : mobile/android/base/resources/layout/home_most_visited_page.xml => mobile/android/base/resources/layout/home_top_sites_page.xml
rename : mobile/android/base/resources/layout/pin_bookmark_dialog.xml => mobile/android/base/resources/layout/pin_site_dialog.xml
rename : mobile/android/base/resources/menu/top_bookmarks_contextmenu.xml => mobile/android/base/resources/menu/top_sites_contextmenu.xml
extra : amend_source : 459360495389bad89cab14a8bd70f3dacb10d9f5
2013-09-19 13:53:14 -04:00
Sriram Ramasubramanian
883b7f02ce Bug 917848: Use a static class for LoadFaviconTask inside TwoLinePageRow. [r=lucasr] 2013-09-19 11:29:34 -04:00
Sriram Ramasubramanian
30a72f7fb4 Bug 917455: Use a single cursor for the grid and the list. [r=lucasr] 2013-09-18 17:30:01 -04:00
Lucas Rocha
c138152b59 Bug 917455 - Update top sites behaviour for about:home's Top Sites panel (r=wesj) 2013-09-18 17:56:32 -04:00
Margaret Leibovic
76740e77fb Bug 917455 - Revert getTopBookmarks back to getTopSites. r=wesj 2013-09-18 13:32:22 -04:00
Sriram Ramasubramanian
cb92ae1efb Bug 917396: Crash in resetting the loader. [r=lucasr] 2013-09-18 10:05:43 -04:00
Sriram Ramasubramanian
5377112311 Bug 833800: LinearLayout of android doesn't have the third constructor in pre-ICS. [r=margaret] 2013-09-18 10:00:37 -04:00
Sriram Ramasubramanian
7630cfaed2 Bug 917396: Move the grid to "TopSites" page. [r=lucasr]
--HG--
rename : mobile/android/base/home/PinBookmarkDialog.java => mobile/android/base/home/PinSiteDialog.java
rename : mobile/android/base/home/TopBookmarksAdapter.java => mobile/android/base/home/TopSitesGridAdapter.java
rename : mobile/android/base/home/TopBookmarkItemView.java => mobile/android/base/home/TopSitesGridItemView.java
rename : mobile/android/base/home/TopBookmarksView.java => mobile/android/base/home/TopSitesGridView.java
rename : mobile/android/base/home/BookmarkThumbnailView.java => mobile/android/base/home/TopSitesThumbnailView.java
rename : mobile/android/base/resources/color/top_bookmark_item_title.xml => mobile/android/base/resources/color/top_sites_grid_item_title.xml
rename : mobile/android/base/resources/drawable-hdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-hdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-mdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-mdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-xhdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-xhdpi/top_site_add.png
rename : mobile/android/base/resources/drawable/bookmark_thumbnail_bg.xml => mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
rename : mobile/android/base/resources/layout/pin_bookmark_dialog.xml => mobile/android/base/resources/layout/pin_site_dialog.xml
rename : mobile/android/base/resources/layout/top_bookmark_item_view.xml => mobile/android/base/resources/layout/top_sites_grid_item_view.xml
rename : mobile/android/base/resources/menu/top_bookmarks_contextmenu.xml => mobile/android/base/resources/menu/top_sites_contextmenu.xml
2013-09-17 16:24:48 -04:00
Sriram Ramasubramanian
747382ea9f Bug 833800: FadedTextView should handle compound drawables. [r=lucasr] 2013-09-17 13:59:10 -04:00
Sriram Ramasubramanian
7ca78c5ed0 Bug 833800: Change the pin to be an image. [r=wesj] 2013-09-17 13:39:18 -04:00
Lucas Rocha
628e8ca9ea Bug 917394 - Rearrange about:home tabs as per new design (r=sriram)
--HG--
rename : mobile/android/base/home/MostVisitedPage.java => mobile/android/base/home/TopSitesPage.java
rename : mobile/android/base/resources/layout/home_most_visited_page.xml => mobile/android/base/resources/layout/home_top_sites_page.xml
2013-09-17 16:58:12 -04:00
Alex Keybl
63a42a7016 Merging in version bump NO BUG 2013-09-17 09:38:37 -04:00
Brad Lassey
0001095466 bug 918645 - rash in java.lang.SecurityException: WifiService: Neither user 10061 nor current process has android.permission.ACCESS_WIFI_STATE. at android.os.Parcel.readException(Parcel.java r=mcmanus
--HG--
extra : rebase_source : fb48217a5654ceba1ec0361466af5698d2f2e3c5
2013-09-20 15:58:10 -04:00
Lucas Rocha
4ff666c014 Bug 910191/913402 - Don't use OnPreDrawObserver on pre-HC devices (r=sriram) 2013-09-18 14:50:22 -04:00
Chris Kitching
bcbe5bf105 Bug 916588 - Show default favicon when we bail in FaviconView.formatImage. r=margaret 2013-09-18 13:47:35 -04:00
Michael Boon
c97145646d Bug 791475 - Android updater notification should provide more information like progress. r=snorp 2013-09-20 10:20:22 -04:00
Ed Morley
0b498129ee Merge latest green inbound changeset and mozilla-central 2013-09-20 10:18:21 +01:00
Michael Comella
eacf365766 Bug 870171 - Implement pruning service. r=rnewman,nalexander 2013-09-19 17:41:05 -04:00
Michael Comella
864f7c48f1 Bug 870171 2013-09-19 17:41:04 -04:00
Brian Nicholson
08926df4d4 Bug 896281 - Part 2: Remove Sync pref for guest session. r=wesj
--HG--
extra : rebase_source : 9936a08abc8c639d2cb57a65f9c964e9c6e8568b
2013-09-19 13:40:48 -04:00
Brian Nicholson
ff82689fa1 Bug 896281 - Part 1: Disable synced tab for guest session. r=sriram
--HG--
extra : rebase_source : 621253f2a28aca48fff7957c20fde7f8097887a2
2013-09-19 13:40:48 -04:00
Margaret Leibovic
a88aad5e3e Bug 913683 - (Part 2) Remove about:home from testSystemPages checks. r=gbrown 2013-09-19 09:38:00 -04:00
Margaret Leibovic
a68a0a7a3f Bug 913683 - (Part 1) Verify home pager is hidden before checking to make sure the page is painted, and increase the time we wait to make sure these things happen. r=gbrown 2013-09-19 09:37:58 -04:00
Myk Melez
8ba7dcf98f bug 918611 - define MOZ_FENNEC when building mobile/android; r=glandium
--HG--
extra : amend_source : b7c5c8d9facabc7331bd221de3787dbf137df86d
2013-09-20 08:20:46 -07:00
Ed Morley
4a3427461b Merge mozilla-central and inbound 2013-09-20 10:55:03 +01:00
Honza Bambas
da53acf440 Bug 913807 - HTTP cache v2: API+top service+integration+tests, off by default, r=michal+ehsan+mark.finkle+fabrice+mhammond+gavin 2013-09-20 11:11:25 +02:00
Margaret Leibovic
93f401fd87 Bug 905262 - Create a JS add-on API for adding content to the promotional banner. r=wesj 2013-08-19 17:22:47 -07:00
Richard Newman
eebb5ab023 Bug 916316 - Follow-up to fix bustage on a CLOSED TREE. r=trivial 2013-09-18 13:12:26 -04:00
Lucas Rocha
59c9b9f42e Bug 905685 - Clear favicon until the new image finishes loading in TwoLinePageRow (r=sriram) 2013-09-18 12:58:58 -04:00
Lucas Rocha
63ca8c5534 Bug 905685 - Don't try to load favicons from cursor in TwoLinePageRow (r=sriram) 2013-09-18 12:58:50 -04:00
Lucas Rocha
3434ba42e2 Bug 905685 - Implement incremental favicon loading in about:home (r=sriram) 2013-09-18 12:58:25 -04:00
Richard Newman
ff1042bcb4 Bug 916316 - Speed up FHR date formatting. r=mcomella 2013-09-18 11:48:11 -04:00
Carsten "Tomcat" Book
a5d24f9255 merge fx-team to mc 2013-09-18 12:12:28 +02:00
Mark Capella
b24da8d2f0 Bug 770101 - about:config should label integer fields correctly so keyboard uses numerical mode, r=wesj 2013-09-17 23:54:48 -04:00
Mark Capella
3d365633c5 Bug 913214 - Create StringUtils method to provide readable URL / title string, r=wesj, sriram 2013-09-17 23:54:48 -04:00
Ryan VanderMeulen
8a6a806c2a Merge m-c to inbound. 2013-09-17 22:47:28 -04:00
Matt Brubeck
2e6e8f6144 Bug 917059 - Fix download size display when decimal separator is ',' [r=bnicholson] 2013-09-17 10:23:57 -07:00
Ed Morley
b3de418550 Backed out changeset dea697e42d70 (bug 913683) for robocop test failures 2013-09-17 16:12:30 +01:00