Merge "Annotate AttributeSet with @Nullable" into sc-v2-dev

This commit is contained in:
Fedor Kudasov
2021-11-12 08:17:55 +00:00
committed by Android (Google) Code Review
5 changed files with 17 additions and 10 deletions

View File

@@ -15,6 +15,8 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import androidx.annotation.Nullable;
import com.android.launcher3.InsettableFrameLayout;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAnimUtils;
@@ -51,11 +53,11 @@ public class FloatingTaskView extends FrameLayout {
this(context, null);
}
public FloatingTaskView(Context context, AttributeSet attrs) {
public FloatingTaskView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0);
}
public FloatingTaskView(Context context, AttributeSet attrs, int defStyleAttr) {
public FloatingTaskView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
mLauncher = Launcher.getLauncher(context);
mIsRtl = Utilities.isRtl(getResources());

View File

@@ -30,6 +30,8 @@ import android.view.ViewGroup;
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.widget.FrameLayout;
import androidx.annotation.Nullable;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
@@ -68,11 +70,11 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
this(context, null);
}
public FloatingWidgetView(Context context, AttributeSet attrs) {
public FloatingWidgetView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0);
}
public FloatingWidgetView(Context context, AttributeSet attrs, int defStyleAttr) {
public FloatingWidgetView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
mLauncher = Launcher.getLauncher(context);
mListenerView = new ListenerView(context, attrs);

View File

@@ -30,6 +30,8 @@ import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.Surface;
import androidx.annotation.Nullable;
import com.android.launcher3.BaseQuickstepLauncher;
import com.android.launcher3.LauncherState;
import com.android.launcher3.statehandlers.DepthController;
@@ -49,11 +51,11 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun
this(context, null);
}
public LauncherRecentsView(Context context, AttributeSet attrs) {
public LauncherRecentsView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0);
}
public LauncherRecentsView(Context context, AttributeSet attrs, int defStyleAttr) {
public LauncherRecentsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr, LauncherActivityInterface.INSTANCE);
mActivity.getStateManager().addStateListener(this);
}

View File

@@ -43,6 +43,7 @@ import android.util.Property;
import android.view.Surface;
import android.view.View;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.graphics.ColorUtils;
@@ -102,11 +103,11 @@ public class TaskThumbnailView extends View {
this(context, null);
}
public TaskThumbnailView(Context context, AttributeSet attrs) {
public TaskThumbnailView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0);
}
public TaskThumbnailView(Context context, AttributeSet attrs, int defStyleAttr) {
public TaskThumbnailView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
mPaint.setFilterBitmap(true);
mBackgroundPaint.setColor(Color.WHITE);

View File

@@ -424,11 +424,11 @@ public class TaskView extends FrameLayout implements Reusable {
this(context, null);
}
public TaskView(Context context, AttributeSet attrs) {
public TaskView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0);
}
public TaskView(Context context, AttributeSet attrs, int defStyleAttr) {
public TaskView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
mActivity = StatefulActivity.fromContext(context);
setOnClickListener(this::onClick);