Merge "Add @Nullable annotations to Task fields" into sc-v2-dev am: 2d7f52505e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241227 Change-Id: I135271bb6990b3c8968632add827ed229a85accb
This commit is contained in:
@@ -23,17 +23,14 @@ import android.app.ActivityManager.TaskDescription;
|
|||||||
import android.app.TaskInfo;
|
import android.app.TaskInfo;
|
||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.ActivityInfo;
|
|
||||||
import android.graphics.Color;
|
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.os.Parcel;
|
import android.os.Parcel;
|
||||||
import android.os.Parcelable;
|
import android.os.Parcelable;
|
||||||
import android.view.ViewDebug;
|
import android.view.ViewDebug;
|
||||||
|
|
||||||
import com.android.systemui.shared.recents.utilities.Utilities;
|
import androidx.annotation.Nullable;
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -202,8 +199,8 @@ public class Task {
|
|||||||
* The icon is the task description icon (if provided), which falls back to the activity icon,
|
* The icon is the task description icon (if provided), which falls back to the activity icon,
|
||||||
* which can then fall back to the application icon.
|
* which can then fall back to the application icon.
|
||||||
*/
|
*/
|
||||||
public Drawable icon;
|
@Nullable public Drawable icon;
|
||||||
public ThumbnailData thumbnail;
|
@Nullable public ThumbnailData thumbnail;
|
||||||
@ViewDebug.ExportedProperty(category="recents")
|
@ViewDebug.ExportedProperty(category="recents")
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public String title;
|
public String title;
|
||||||
|
|||||||
Reference in New Issue
Block a user