PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert^2 "Nullability Annotations replacement"" into main

Browse Source
This commit is contained in:
Sunny Shao
2024-01-10 08:35:06 +00:00
committed by Android (Google) Code Review
parent b6a6b1e91a 076ed573eb
commit bee65b4109
130 changed files with 198 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/core/CategoryMixin.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.core;
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
import android.annotation.Nullable;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -30,6 +29,7 @@ import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;

3
src/com/android/settings/core/PreferenceControllerListHelper.java
View File

@@ -20,13 +20,14 @@ import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTRO
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_FOR_WORK;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
import android.annotation.NonNull;
import android.annotation.XmlRes;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
import com.android.settingslib.core.AbstractPreferenceController;

2
src/com/android/settings/core/PreferenceXmlParserUtils.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.core;
import android.annotation.NonNull;
import android.annotation.XmlRes;
import android.content.Context;
import android.content.res.TypedArray;
@@ -28,6 +27,7 @@ import android.util.Log;
import android.util.Xml;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import com.android.settings.R;