Revert "Nullability Annotations replacement"

This reverts commit cf0501e4d7.

Reason for revert: b/317462033, it seems a flaky but revert it first.

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
This commit is contained in:
Sunny Shao
2023-12-29 02:28:24 +00:00
committed by Android (Google) Code Review
parent cf0501e4d7
commit 19d1d3d15d
130 changed files with 154 additions and 198 deletions

View File

@@ -16,13 +16,13 @@
package com.android.settings.widget;
import android.annotation.Nullable;
import android.content.Context;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
/**

View File

@@ -16,6 +16,7 @@
package com.android.settings.widget;
import android.annotation.Nullable;
import android.os.Bundle;
import android.util.TypedValue;
import android.view.Gravity;
@@ -24,8 +25,6 @@ import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.widget.TextView;
import androidx.annotation.Nullable;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;

View File

@@ -17,6 +17,8 @@
package com.android.settings.widget;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
@@ -28,9 +30,6 @@ import android.view.ViewDebug;
import android.view.ViewGroup;
import android.view.ViewHierarchyEncoder;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.R;
import java.lang.annotation.Retention;

View File

@@ -16,16 +16,15 @@
package com.android.settings.widget;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
import android.graphics.drawable.DrawableWrapper;
import android.util.AttributeSet;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import com.android.settings.R;

View File

@@ -16,6 +16,7 @@
package com.android.settings.widget;
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Canvas;
@@ -34,7 +35,6 @@ import android.util.SparseIntArray;
import android.util.TypedValue;
import android.view.View;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;