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

Bug 925546: OnPinSiteListener -> OnEditPinnedSiteListener. r=sriram

Browse Source
This commit is contained in:
Michael Comella 2013-10-16 10:09:41 -07:00
parent 3778681ae3
commit e5330ada3e
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mobile/android/base/home/TopSitesGridView.java
View File

@ -33,9 +33,9 @@ import java.util.EnumSet;
public class TopSitesGridView extends GridView {
private static final String LOGTAG = "GeckoTopSitesGridView";
// Listener for pinning sites.
public static interface OnPinSiteListener {
public void onPinSite(int position);
// Listener for editing pinned sites.
public static interface OnEditPinnedSiteListener {
public void onEditPinnedSite(int position);
}
// Max number of top sites that needs to be shown.
@ -59,8 +59,8 @@ public class TopSitesGridView extends GridView {
// On URL open listener.
private OnUrlOpenListener mUrlOpenListener;
// Pin site listener.
private OnPinSiteListener mPinSiteListener;
// Edit pinned site listener.
private OnEditPinnedSiteListener mEditPinnedSiteListener;
// Context menu info.
private TopSitesGridContextMenuInfo mContextMenuInfo;
@ -114,8 +114,8 @@ public class TopSitesGridView extends GridView {
mUrlOpenListener.onUrlOpen(url, EnumSet.noneOf(OnUrlOpenListener.Flags.class));
}
} else {
if (mPinSiteListener != null) {
mPinSiteListener.onPinSite(position);
if (mEditPinnedSiteListener != null) {
mEditPinnedSiteListener.onEditPinnedSite(position);
}
}
}
@ -136,7 +136,7 @@ public class TopSitesGridView extends GridView {
super.onDetachedFromWindow();
mUrlOpenListener = null;
mPinSiteListener = null;
mEditPinnedSiteListener = null;
}
@Override
@ -229,12 +229,12 @@ public class TopSitesGridView extends GridView {
}
/**
* Set a pin site listener to be used by this view.
* Set an edit pinned site listener to be used by this view.
*
* @param listener A pin site listener for this view.
* @param listener An edit pinned site listener for this view.
*/
public void setOnPinSiteListener(OnPinSiteListener listener) {
mPinSiteListener = listener;
public void setOnEditPinnedSiteListener(final OnEditPinnedSiteListener listener) {
mEditPinnedSiteListener = listener;
}
/**

20
mobile/android/base/home/TopSitesPage.java
View File

@ -20,7 +20,7 @@ import org.mozilla.gecko.gfx.BitmapUtils;
import org.mozilla.gecko.home.HomeListView.HomeContextMenuInfo;
import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
import org.mozilla.gecko.home.PinSiteDialog.OnSiteSelectedListener;
import org.mozilla.gecko.home.TopSitesGridView.OnPinSiteListener;
import org.mozilla.gecko.home.TopSitesGridView.OnEditPinnedSiteListener;
import org.mozilla.gecko.home.TopSitesGridView.TopSitesGridContextMenuInfo;
import org.mozilla.gecko.util.ThreadUtils;
@ -100,8 +100,8 @@ public class TopSitesPage extends HomeFragment {
// Callback for thumbnail loader
private ThumbnailsLoaderCallbacks mThumbnailsLoaderCallbacks;
// Listener for pinning sites
private PinSiteListener mPinSiteListener;
// Listener for editing pinned sites.
private EditPinnedSiteListener mEditPinnedSiteListener;
// On URL open listener
private OnUrlOpenListener mUrlOpenListener;
@ -155,7 +155,7 @@ public class TopSitesPage extends HomeFragment {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
mPinSiteListener = new PinSiteListener();
mEditPinnedSiteListener = new EditPinnedSiteListener();
mList.setTag(HomePager.LIST_TAG_TOP_SITES);
mList.setHeaderDividersEnabled(false);
@ -186,7 +186,7 @@ public class TopSitesPage extends HomeFragment {
});
mGrid.setOnUrlOpenListener(mUrlOpenListener);
mGrid.setOnPinSiteListener(mPinSiteListener);
mGrid.setOnEditPinnedSiteListener(mEditPinnedSiteListener);
registerForContextMenu(mList);
registerForContextMenu(mGrid);
@ -338,7 +338,7 @@ public class TopSitesPage extends HomeFragment {
}
if (itemId == R.id.top_sites_edit) {
mPinSiteListener.onPinSite(info.position);
mEditPinnedSiteListener.onEditPinnedSite(info.position);
return true;
}
@ -371,10 +371,10 @@ public class TopSitesPage extends HomeFragment {
}
/**
* Listener for pinning sites.
* Listener for editing pinned sites.
*/
private class PinSiteListener implements OnPinSiteListener,
OnSiteSelectedListener {
private class EditPinnedSiteListener implements OnEditPinnedSiteListener,
OnSiteSelectedListener {
// Tag for the PinSiteDialog fragment.
private static final String TAG_PIN_SITE = "pin_site";
@ -382,7 +382,7 @@ public class TopSitesPage extends HomeFragment {
private int mPosition;
@Override
public void onPinSite(int position) {
public void onEditPinnedSite(int position) {
mPosition = position;
final FragmentManager manager = getActivity().getSupportFragmentManager();