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

Bug 997288 - Follow-up, Part 2: Style ButtonToast. r=lucasr

Browse Source
This commit is contained in:
Nick Alexander
2014-05-28 14:13:55 -07:00
parent 4bffc9903b
commit 37a6ba7001
24 changed files with 173 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,13 +116,7 @@ public class ButtonToast {
// Our toast is re-used, so we update all fields to clear any old values.
mMessageView.setText(null != t.message ? t.message : "");
mButton.setText(null != t.buttonMessage ? t.buttonMessage : "");
if (null != t.buttonDrawable) {
mButton.setCompoundDrawablePadding(mView.getContext().getResources().getDimensionPixelSize(R.dimen.toast_button_padding));
mButton.setCompoundDrawablesWithIntrinsicBounds(t.buttonDrawable, null, null, null);
} else {
mButton.setCompoundDrawablePadding(0);
mButton.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
}
mButton.setCompoundDrawablesWithIntrinsicBounds(t.buttonDrawable, null, null, null);
mHideHandler.removeCallbacks(mHideRunnable);
mHideHandler.postDelayed(mHideRunnable, TOAST_DURATION);