mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset 7f1cfc8c84e8
This commit is contained in:
Margaret Leibovic
parent
6bfe3bb21f
commit
8641e36074
@ -220,7 +220,6 @@ FENNEC_JAVA_FILES = \
|
|||||||
home/HomePagerTabStrip.java \
|
home/HomePagerTabStrip.java \
|
||||||
home/FadedTextView.java \
|
home/FadedTextView.java \
|
||||||
home/FaviconsLoader.java \
|
home/FaviconsLoader.java \
|
||||||
home/ReadingListPage.java
|
|
||||||
home/SearchEngine.java \
|
home/SearchEngine.java \
|
||||||
home/SearchEngineRow.java \
|
home/SearchEngineRow.java \
|
||||||
home/SimpleCursorLoader.java \
|
home/SimpleCursorLoader.java \
|
||||||
|
|||||||
@ -28,8 +28,7 @@ public class HomePager extends ViewPager {
|
|||||||
// List of pages in order.
|
// List of pages in order.
|
||||||
private enum Page {
|
private enum Page {
|
||||||
VISITED,
|
VISITED,
|
||||||
BOOKMARKS,
|
BOOKMARKS
|
||||||
READING_LIST
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private EnumMap<Page, Fragment> mPages = new EnumMap<Page, Fragment>(Page.class);
|
private EnumMap<Page, Fragment> mPages = new EnumMap<Page, Fragment>(Page.class);
|
||||||
@ -60,7 +59,6 @@ public class HomePager extends ViewPager {
|
|||||||
// Add the pages to the adapter in order.
|
// Add the pages to the adapter in order.
|
||||||
adapter.addTab(Page.VISITED, VisitedPage.class, null, getContext().getString(R.string.visited_title));
|
adapter.addTab(Page.VISITED, VisitedPage.class, null, getContext().getString(R.string.visited_title));
|
||||||
adapter.addTab(Page.BOOKMARKS, BookmarksPage.class, null, getContext().getString(R.string.bookmarks_title));
|
adapter.addTab(Page.BOOKMARKS, BookmarksPage.class, null, getContext().getString(R.string.bookmarks_title));
|
||||||
adapter.addTab(Page.READING_LIST, ReadingListPage.class, null, getContext().getString(R.string.reading_list));
|
|
||||||
|
|
||||||
setAdapter(adapter);
|
setAdapter(adapter);
|
||||||
|
|
||||||
|
|||||||
@ -1,183 +0,0 @@
|
|||||||
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
package org.mozilla.gecko.home;
|
|
||||||
|
|
||||||
import org.mozilla.gecko.R;
|
|
||||||
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
|
|
||||||
import org.mozilla.gecko.db.BrowserDB;
|
|
||||||
import org.mozilla.gecko.db.BrowserDB.URLColumns;
|
|
||||||
import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
|
|
||||||
import org.mozilla.gecko.home.TwoLinePageRow;
|
|
||||||
import org.mozilla.gecko.ReaderModeUtils;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.database.Cursor;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v4.app.LoaderManager.LoaderCallbacks;
|
|
||||||
import android.support.v4.content.Loader;
|
|
||||||
import android.support.v4.widget.CursorAdapter;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.ListView;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fragment that displays reading list contents in a ListView.
|
|
||||||
*/
|
|
||||||
public class ReadingListPage extends HomeFragment {
|
|
||||||
// Cursor loader ID for reading list
|
|
||||||
private static final int READING_LIST_LOADER_ID = 0;
|
|
||||||
|
|
||||||
// Adapter for the list of reading list items
|
|
||||||
private ReadingListAdapter mAdapter;
|
|
||||||
|
|
||||||
// The view shown by the fragment
|
|
||||||
private ListView mList;
|
|
||||||
|
|
||||||
// Callbacks used for the reading list and favicon cursor loaders
|
|
||||||
private CursorLoaderCallbacks mCursorLoaderCallbacks;
|
|
||||||
|
|
||||||
// On URL open listener
|
|
||||||
private OnUrlOpenListener mUrlOpenListener;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onAttach(Activity activity) {
|
|
||||||
super.onAttach(activity);
|
|
||||||
|
|
||||||
try {
|
|
||||||
mUrlOpenListener = (OnUrlOpenListener) activity;
|
|
||||||
} catch (ClassCastException e) {
|
|
||||||
throw new ClassCastException(activity.toString()
|
|
||||||
+ " must implement HomePager.OnUrlOpenListener");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDetach() {
|
|
||||||
super.onDetach();
|
|
||||||
|
|
||||||
mUrlOpenListener = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
|
||||||
// All list views are styled to look the same with a global activity theme.
|
|
||||||
// If the style of the list changes, inflate it from an XML.
|
|
||||||
mList = new HomeListView(container.getContext());
|
|
||||||
return mList;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
|
||||||
super.onViewCreated(view, savedInstanceState);
|
|
||||||
|
|
||||||
mList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
|
||||||
final Cursor c = mAdapter.getCursor();
|
|
||||||
if (c == null || !c.moveToPosition(position)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String url = c.getString(c.getColumnIndexOrThrow(URLColumns.URL));
|
|
||||||
url = ReaderModeUtils.getAboutReaderForUrl(url, true);
|
|
||||||
mUrlOpenListener.onUrlOpen(url);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
registerForContextMenu(mList);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroyView() {
|
|
||||||
super.onDestroyView();
|
|
||||||
mList = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onActivityCreated(Bundle savedInstanceState) {
|
|
||||||
super.onActivityCreated(savedInstanceState);
|
|
||||||
|
|
||||||
mAdapter = new ReadingListAdapter(getActivity(), null);
|
|
||||||
mList.setAdapter(mAdapter);
|
|
||||||
|
|
||||||
// Create callbacks before the initial loader is started.
|
|
||||||
mCursorLoaderCallbacks = new CursorLoaderCallbacks();
|
|
||||||
|
|
||||||
// Reconnect to the loader only if it's present.
|
|
||||||
getLoaderManager().initLoader(READING_LIST_LOADER_ID, null, mCursorLoaderCallbacks);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cursor loader for the list of reading list items.
|
|
||||||
*/
|
|
||||||
private static class ReadingListLoader extends SimpleCursorLoader {
|
|
||||||
public ReadingListLoader(Context context) {
|
|
||||||
super(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Cursor loadCursor() {
|
|
||||||
return BrowserDB.getBookmarksInFolder(getContext().getContentResolver(), Bookmarks.FIXED_READING_LIST_ID);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cursor adapter for the list of reading list items.
|
|
||||||
*/
|
|
||||||
private class ReadingListAdapter extends CursorAdapter {
|
|
||||||
public ReadingListAdapter(Context context, Cursor cursor) {
|
|
||||||
super(context, cursor);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void bindView(View view, Context context, Cursor cursor) {
|
|
||||||
final TwoLinePageRow row = (TwoLinePageRow) view;
|
|
||||||
row.updateFromCursor(cursor);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View newView(Context context, Cursor cursor, ViewGroup parent) {
|
|
||||||
return LayoutInflater.from(parent.getContext()).inflate(R.layout.home_item_row, parent, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* LoaderCallbacks implementation that interacts with the LoaderManager.
|
|
||||||
*/
|
|
||||||
private class CursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
|
|
||||||
@Override
|
|
||||||
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
|
|
||||||
switch(id) {
|
|
||||||
case READING_LIST_LOADER_ID:
|
|
||||||
return new ReadingListLoader(getActivity());
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
|
|
||||||
final int loaderId = loader.getId();
|
|
||||||
switch(loaderId) {
|
|
||||||
case READING_LIST_LOADER_ID:
|
|
||||||
mAdapter.swapCursor(c);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLoaderReset(Loader<Cursor> loader) {
|
|
||||||
final int loaderId = loader.getId();
|
|
||||||
switch(loaderId) {
|
|
||||||
case READING_LIST_LOADER_ID:
|
|
||||||
mAdapter.swapCursor(null);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user