Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66710c79 authored by Amy Gu's avatar Amy Gu Committed by Automerger Merge Worker
Browse files

Merge "Update docs to reflect that toast should take activity context, not... 

Merge "Update docs to reflect that toast should take activity context, not application context." am: 9ed3c880 am: 0da89ddc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2597393



Change-Id: I14a7889a6f433fd9baa7a4bcc5784619fb6bdf6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02634220 0da89ddc

core/java/android/widget/Toast.java

+3 −6
Original line number Diff line number Diff line
@@ -154,8 +154,7 @@ public class Toast { 
     * Construct an empty Toast object.  You must call {@link #setView} before you

     * can call {@link #show}.

     *

     * @param context  The context to use.  Usually your {@link android.app.Application}

     *                 or {@link android.app.Activity} object.

     * @param context  The context to use.  Usually your {@link android.app.Activity} object.

     */

    public Toast(Context context) {

        this(context, null);
@@ -479,8 +478,7 @@ public class Toast { 
    /**

     * Make a standard toast that just contains text.

     *

     * @param context  The context to use.  Usually your {@link android.app.Application}

     *                 or {@link android.app.Activity} object.

     * @param context  The context to use.  Usually your {@link android.app.Activity} object.

     * @param text     The text to show.  Can be formatted text.

     * @param duration How long to display the message.  Either {@link #LENGTH_SHORT} or

     *                 {@link #LENGTH_LONG}
@@ -536,8 +534,7 @@ public class Toast { 
    /**

     * Make a standard toast that just contains text from a resource.

     *

     * @param context  The context to use.  Usually your {@link android.app.Application}

     *                 or {@link android.app.Activity} object.

     * @param context  The context to use.  Usually your {@link android.app.Activity} object.

     * @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

     *                 {@link #LENGTH_LONG}