Merge "Update docs to reflect that toast should take activity context, not application context." (9ed3c880) · Commits · e / os / android_frameworks_base

core/java/android/widget/Toast.java

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -154,8 +154,7 @@ public class Toast {
	* Construct an empty Toast object. You must call {@link #setView} before you		* Construct an empty Toast object. You must call {@link #setView} before you
	* can call {@link #show}.		* can call {@link #show}.
	*		*
	* @param context The context to use. Usually your {@link android.app.Application}		* @param context The context to use. Usually your {@link android.app.Activity} object.
	* or {@link android.app.Activity} object.
	*/		*/
	public Toast(Context context) {		public Toast(Context context) {
	this(context, null);		this(context, null);
	@@ -479,8 +478,7 @@ public class Toast {
	/**		/**
	* Make a standard toast that just contains text.		* Make a standard toast that just contains text.
	*		*
	* @param context The context to use. Usually your {@link android.app.Application}		* @param context The context to use. Usually your {@link android.app.Activity} object.
	* or {@link android.app.Activity} object.
	* @param text The text to show. Can be formatted text.		* @param text The text to show. Can be formatted text.
	* @param duration How long to display the message. Either {@link #LENGTH_SHORT} or		* @param duration How long to display the message. Either {@link #LENGTH_SHORT} or
	* {@link #LENGTH_LONG}		* {@link #LENGTH_LONG}
	@@ -536,8 +534,7 @@ public class Toast {
	/**		/**
	* Make a standard toast that just contains text from a resource.		* Make a standard toast that just contains text from a resource.
	*		*
	* @param context The context to use. Usually your {@link android.app.Application}		* @param context The context to use. Usually your {@link android.app.Activity} object.
	* or {@link android.app.Activity} object.
	* @param resId The resource id of the string resource to use. Can be formatted text.		* @param resId The resource id of the string resource to use. Can be formatted text.
	* @param duration How long to display the message. Either {@link #LENGTH_SHORT} or		* @param duration How long to display the message. Either {@link #LENGTH_SHORT} or
	* {@link #LENGTH_LONG}		* {@link #LENGTH_LONG}