Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark getView() with @Nullable"

Browse Source
This commit is contained in:
Bernardo Rufino
2020-02-08 00:28:37 +00:00
committed by Android (Google) Code Review
parent 78e1da90ee b609468572
commit f5b271fb4c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -60899,7 +60899,7 @@ package android.widget {
method public int getGravity();
method public float getHorizontalMargin();
method public float getVerticalMargin();
method @Deprecated public android.view.View getView();
method @Deprecated @Nullable public android.view.View getView();
method public int getXOffset();
method public int getYOffset();
method public static android.widget.Toast makeText(android.content.Context, CharSequence, int);

13
core/java/android/widget/Toast.java
View File

@@ -263,9 +263,14 @@ public class Toast {
/**
* Return the view.
*
* <p><strong>Warning:</strong> Starting from Android {@link Build.VERSION_CODES#R}, for apps
* targeting API level {@link Build.VERSION_CODES#R} or higher that haven't called {@link
* #setView(View)} with a non-{@code null} view, this method will return {@code null}.
* <p>Toasts constructed with {@link #Toast(Context)} that haven't called {@link #setView(View)}
* with a non-{@code null} view will return {@code null} here.
*
* <p>Starting from Android {@link Build.VERSION_CODES#R}, in apps targeting API level {@link
* Build.VERSION_CODES#R} or higher, toasts constructed with {@link #makeText(Context,
* CharSequence, int)} or its variants will also return {@code null} here unless they had called
* {@link #setView(View)} with a non-{@code null} view. If you want to be notified when the
* toast is shown or hidden, use {@link #addCallback(Callback)}.
*
* @see #setView
* @deprecated Custom toast views are deprecated. Apps can create a standard text toast with the
@@ -276,7 +281,7 @@ public class Toast {
* will not have custom toast views displayed.
*/
@Deprecated
public View getView() {
@Nullable public View getView() {
return mNextView;
}