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

Commit 820f8b6d authored by Fedor Kudasov's avatar Fedor Kudasov Committed by Automerger Merge Worker
Browse files

Merge "Annotate AttributeSet with @Nullable" into sc-v2-dev am: 6c7c91fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16233502

Change-Id: I44b3c235304572fc034a38584324a7f275fd24d9
parents 9dfc2ba0 6c7c91fe

quickstep/src/com/android/quickstep/views/FloatingTaskView.java

+4 −2
Original line number Diff line number Diff line
@@ -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());

quickstep/src/com/android/quickstep/views/FloatingWidgetView.java

+4 −2
Original line number Diff line number Diff line
@@ -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);

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

+4 −2
Original line number Diff line number Diff line
@@ -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);

    }

quickstep/src/com/android/quickstep/views/TaskThumbnailView.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

quickstep/src/com/android/quickstep/views/TaskView.java

+2 −2
Original line number Diff line number Diff line
@@ -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);