corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 880454 - Don't hide button toasts that are being pressed. r=lucasr

Browse Source
This commit is contained in:
Wes Johnston
2013-07-09 13:43:35 -07:00
parent 59c49e6a65
commit b9c6bfe10d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,9 @@ public class ButtonToast {
return;
hide(false);
mListener.onButtonClicked(mToken);
if (mListener != null) {
mListener.onButtonClicked(t.token);
}
}
});
@@ -99,6 +101,7 @@ public class ButtonToast {
}
mCurrentToast = t;
mButton.setEnabled(true);
mMessageView.setText(t.message);
mButton.setText(t.buttonMessage);
@@ -118,7 +121,13 @@ public class ButtonToast {
}
public void hide(boolean immediate) {
if (mButton.isPressed()) {
mHideHandler.postDelayed(mHideRunnable, TOAST_DURATION);
return;
}
mCurrentToast = null;
mButton.setEnabled(false);
mHideHandler.removeCallbacks(mHideRunnable);
int duration = immediate ? 0 : mView.getResources().getInteger(android.R.integer.config_longAnimTime);