From 2d963a2899afbe000d1ab498f94de87f25e33184 Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 10 Aug 2011 15:53:07 -0700 Subject: Support horizontal swipe in combo activity Bug: 5145315 Change-Id: I1e9b4a6bae325244c7a3fb6159deadc3fcf170e6 --- src/com/android/browser/BrowserHistoryPage.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/com/android/browser/BrowserHistoryPage.java') diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java index 942a8fd39..6625e5507 100644 --- a/src/com/android/browser/BrowserHistoryPage.java +++ b/src/com/android/browser/BrowserHistoryPage.java @@ -61,8 +61,6 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import com.android.browser.CombinedBookmarkHistoryView.CombinedBookmarksCallbacks; - /** * Activity for displaying the browser's history, divided into * days of viewing. @@ -112,13 +110,6 @@ public class BrowserHistoryPage extends Fragment cm.setText(text); } - static BrowserHistoryPage newInstance(CombinedBookmarksCallbacks cb, Bundle args) { - BrowserHistoryPage bhp = new BrowserHistoryPage(); - bhp.mCallback = cb; - bhp.setArguments(args); - return bhp; - } - @Override public Loader onCreateLoader(int id, Bundle args) { Uri.Builder combinedBuilder = Combined.CONTENT_URI.buildUpon(); @@ -208,6 +199,7 @@ public class BrowserHistoryPage extends Fragment mDisableNewWindow = args.getBoolean(BrowserBookmarksPage.EXTRA_DISABLE_WINDOW, false); int mvlimit = getResources().getInteger(R.integer.most_visits_limit); mMostVisitsLimit = Integer.toString(mvlimit); + mCallback = (CombinedBookmarksCallbacks) getActivity(); } @Override @@ -663,9 +655,6 @@ public class BrowserHistoryPage extends Fragment if (data != null) { item.setFavicon(BitmapFactory.decodeByteArray(data, 0, data.length)); - } else { - item.setFavicon(CombinedBookmarkHistoryView - .getIconListenerSet().getFavicon(url)); } item.setIsBookmark(cursor.getInt(HistoryQuery.INDEX_IS_BOOKMARK) == 1); return item; -- cgit v1.2.3