Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-31 14:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 46f75b2f314c (bug 884075)

Browse Source
This commit is contained in:
Ed Morley 2013-07-16 11:59:58 +01:00
parent 3fe542508d
commit 4bb2a6f1f8
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/BrowserApp.java
View File

@ -1686,9 +1686,6 @@ abstract public class BrowserApp extends GeckoApp
public void onButtonClicked() {
showBookmarkDialog();
}
@Override
public void onToastHidden(ButtonToast.ReasonHidden reason) { }
});
item.setIcon(R.drawable.ic_menu_bookmark_remove);
}

20
mobile/android/base/widget/ButtonToast.java
View File

@ -47,12 +47,6 @@ public class ButtonToast {
private final LinkedList<Toast> mQueue = new LinkedList<Toast>();
private Toast mCurrentToast;
public enum ReasonHidden {
CLICKED,
TIMEOUT,
STARTUP
}
// State objects
private static class Toast {
public final CharSequence buttonMessage;
@ -71,7 +65,6 @@ public class ButtonToast {
public interface ToastListener {
void onButtonClicked();
void onToastHidden(ReasonHidden reason);
}
public ButtonToast(View view) {
@ -86,14 +79,14 @@ public class ButtonToast {
if (t == null)
return;
hide(false, ReasonHidden.CLICKED);
hide(false);
if (t.listener != null) {
t.listener.onButtonClicked();
}
}
});
hide(true, ReasonHidden.STARTUP);
hide(true);
}
public void show(boolean immediate, CharSequence message,
@ -130,15 +123,12 @@ public class ButtonToast {
mView.startAnimation(alpha);
}
public void hide(boolean immediate, ReasonHidden reason) {
if (mButton.isPressed() && reason != ReasonHidden.CLICKED) {
public void hide(boolean immediate) {
if (mButton.isPressed()) {
mHideHandler.postDelayed(mHideRunnable, TOAST_DURATION);
return;
}
if (mCurrentToast != null && mCurrentToast.listener != null) {
mCurrentToast.listener.onToastHidden(reason);
}
mCurrentToast = null;
mButton.setEnabled(false);
mHideHandler.removeCallbacks(mHideRunnable);
@ -183,7 +173,7 @@ public class ButtonToast {
private Runnable mHideRunnable = new Runnable() {
@Override
public void run() {
hide(false, ReasonHidden.TIMEOUT);
hide(false);
}
};
}