Bug 709078 - Only load necessary cols on awesomescreen filter and about:home queries (r=blassey)
Top Sites in about:home doesn't need favicons and awesomescreen filter doesn't need thumbnails.
This commit is contained in:
@@ -63,13 +63,9 @@ public class AndroidBrowserDB implements BrowserDB.BrowserDBIface {
|
||||
|
||||
private static final Uri BOOKMARKS_CONTENT_URI_POST_11 = Uri.parse("content://com.android.browser/bookmarks");
|
||||
|
||||
public Cursor filter(ContentResolver cr, CharSequence constraint, int limit, CharSequence urlFilter) {
|
||||
private Cursor filterAllSites(ContentResolver cr, String[] projection, CharSequence constraint, int limit, CharSequence urlFilter) {
|
||||
Cursor c = cr.query(Browser.BOOKMARKS_URI,
|
||||
new String[] { URL_COLUMN_ID,
|
||||
BookmarkColumns.URL,
|
||||
BookmarkColumns.TITLE,
|
||||
BookmarkColumns.FAVICON,
|
||||
URL_COLUMN_THUMBNAIL },
|
||||
projection,
|
||||
// The length restriction on URL is for the same reason as in the general bookmark query
|
||||
// (see comment earlier in this file).
|
||||
(urlFilter != null ? "(" + Browser.BookmarkColumns.URL + " NOT LIKE ? ) AND " : "" ) +
|
||||
@@ -86,6 +82,28 @@ public class AndroidBrowserDB implements BrowserDB.BrowserDBIface {
|
||||
return new AndroidDBCursor(c);
|
||||
}
|
||||
|
||||
public Cursor filter(ContentResolver cr, CharSequence constraint, int limit) {
|
||||
return filterAllSites(cr,
|
||||
new String[] { URL_COLUMN_ID,
|
||||
BookmarkColumns.URL,
|
||||
BookmarkColumns.TITLE,
|
||||
BookmarkColumns.FAVICON },
|
||||
constraint,
|
||||
limit,
|
||||
null);
|
||||
}
|
||||
|
||||
public Cursor getTopSites(ContentResolver cr, int limit) {
|
||||
return filterAllSites(cr,
|
||||
new String[] { URL_COLUMN_ID,
|
||||
BookmarkColumns.URL,
|
||||
BookmarkColumns.TITLE,
|
||||
URL_COLUMN_THUMBNAIL },
|
||||
"",
|
||||
limit,
|
||||
BrowserDB.ABOUT_PAGES_URL_FILTER);
|
||||
}
|
||||
|
||||
public void updateVisitedHistory(ContentResolver cr, String uri) {
|
||||
Browser.updateVisitedHistory(cr, uri, true);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user