Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1401179 - Add snackbar for bookmark add/remove actions on newtab. r=mcomella

Browse Source 
MozReview-Commit-ID: 7DzoyDSWmVq

--HG--
extra : rebase_source : 4e214080a665d199a2e888c53a114d1585da4fee
This commit is contained in:
Chenxia Liu 2017-09-22 18:08:07 -07:00
parent 71347fe090
commit 7471205583
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/ActivityStreamContextMenu.java
View File

@ -7,7 +7,9 @@ package org.mozilla.gecko.activitystream.homepanel.menu;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.design.widget.Snackbar;
import android.view.MenuItem;
import android.view.View;
@ -44,6 +46,7 @@ public abstract class ActivityStreamContextMenu
private final Context context;
private final WebpageModel item;
@NonNull private final View snackbarAnchor;
private final ActivityStreamTelemetry.Extras.Builder telemetryExtraBuilder;
@ -59,12 +62,14 @@ public abstract class ActivityStreamContextMenu
private final MenuMode mode;
/* package-private */ ActivityStreamContextMenu(final Context context,
final View snackbarAnchor,
final ActivityStreamTelemetry.Extras.Builder telemetryExtraBuilder,
final MenuMode mode,
final WebpageModel item,
HomePager.OnUrlOpenListener onUrlOpenListener,
HomePager.OnUrlOpenInBackgroundListener onUrlOpenInBackgroundListener) {
this.context = context;
this.snackbarAnchor = snackbarAnchor;
this.item = item;
this.telemetryExtraBuilder = telemetryExtraBuilder;
@ -235,10 +240,15 @@ public abstract class ActivityStreamContextMenu
if (item.isBookmarked()) {
db.removeBookmarksWithURL(context.getContentResolver(), item.getUrl());
// See bug 1402521 for adding "options" to the snackbar.
Snackbar.make(ActivityStreamContextMenu.this.snackbarAnchor, R.string.bookmark_removed, Snackbar.LENGTH_LONG).show();
} else {
// We only store raw URLs in history (and bookmarks), hence we won't ever show about:reader
// URLs in AS topsites or highlights. Therefore we don't need to do any special about:reader handling here.
db.addBookmark(context.getContentResolver(), item.getTitle(), item.getUrl());
Snackbar.make(ActivityStreamContextMenu.this.snackbarAnchor, R.string.bookmark_added, Snackbar.LENGTH_LONG).show();
}
item.onStateCommitted();
}
@ -341,6 +351,7 @@ public abstract class ActivityStreamContextMenu
if (!HardwareUtils.isTablet()) {
menu = new BottomSheetContextMenu(context,
anchor,
telemetryExtraBuilder, menuMode,
item, shouldOverrideIconWithImageProvider, onUrlOpenListener, onUrlOpenInBackgroundListener,
tilesWidth, tilesHeight);

2
mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/BottomSheetContextMenu.java
View File

@ -47,6 +47,7 @@ import java.net.URISyntaxException;
private String[] pageDomainTextReference = new String[] { "" };
public BottomSheetContextMenu(final Context context,
final View anchor,
final ActivityStreamTelemetry.Extras.Builder telemetryExtraBuilder,
final MenuMode mode,
final WebpageModel item,
@ -56,6 +57,7 @@ import java.net.URISyntaxException;
final int tilesWidth, final int tilesHeight) {
super(context,
anchor,
telemetryExtraBuilder,
mode,
item,

1
mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/PopupContextMenu.java
View File

@ -36,6 +36,7 @@ import org.mozilla.gecko.activitystream.homepanel.model.WebpageModel;
HomePager.OnUrlOpenListener onUrlOpenListener,
HomePager.OnUrlOpenInBackgroundListener onUrlOpenInBackgroundListener) {
super(context,
anchor,
telemetryExtraBuilder,
mode,
item,