wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset ea2d05f0a053 (bug 856767) for robocop bustage on a CLOSED TREE.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-04-02 17:17:02 -04:00
parent e0e0ce11ba
commit 04fd0a18b7
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/widget/AboutHomeContent.java
View File

@ -192,12 +192,11 @@ public class AboutHomeContent extends ScrollView
* Reinflates and updates all components of this view. * Reinflates and updates all components of this view.
*/ */
public void refresh() { public void refresh() {
mTopSites.onDestroy();
// We must remove the currently inflated view to allow for reinflation. // We must remove the currently inflated view to allow for reinflation.
removeAllViews(); removeAllViews();
inflate(); inflate();
mTopSites.refresh();
// Refresh all elements. // Refresh all elements.
update(AboutHomeContent.UpdateFlags.ALL); update(AboutHomeContent.UpdateFlags.ALL);

26
mobile/android/base/widget/TopSitesView.java
View File

@ -141,15 +141,9 @@ public class TopSitesView extends GridView {
public void onDestroy() { public void onDestroy() {
if (mTopSitesAdapter != null) { if (mTopSitesAdapter != null) {
final Cursor cursor = mTopSitesAdapter.getCursor(); Cursor cursor = mTopSitesAdapter.getCursor();
if (cursor != null && !cursor.isClosed())
ThreadUtils.postToBackgroundThread(new Runnable() { cursor.close();
@Override
public void run() {
if (cursor != null && !cursor.isClosed())
cursor.close();
}
});
} }
} }
@ -192,9 +186,12 @@ public class TopSitesView extends GridView {
public void loadTopSites() { public void loadTopSites() {
final ContentResolver resolver = mContext.getContentResolver(); final ContentResolver resolver = mContext.getContentResolver();
Cursor old = null;
if (mTopSitesAdapter != null) {
old = mTopSitesAdapter.getCursor();
}
// Swap in the new cursor. // Swap in the new cursor.
final Cursor oldCursor = (mTopSitesAdapter != null) ? mTopSitesAdapter.getCursor() : null; final Cursor oldCursor = old;
final Cursor newCursor = BrowserDB.getTopSites(resolver, mNumberOfTopSites); final Cursor newCursor = BrowserDB.getTopSites(resolver, mNumberOfTopSites);
post(new Runnable() { post(new Runnable() {
@ -343,6 +340,13 @@ public class TopSitesView extends GridView {
mLoadCompleteCallback = callback; mLoadCompleteCallback = callback;
} }
public void refresh() {
if (mTopSitesAdapter != null)
mTopSitesAdapter.notifyDataSetChanged();
setAdapter(mTopSitesAdapter);
}
private class TopSitesViewHolder { private class TopSitesViewHolder {
public TextView titleView = null; public TextView titleView = null;
public ImageView thumbnailView = null; public ImageView thumbnailView = null;