diff --git a/src/com/android/settings/RemoteBugreportActivity.java b/src/com/android/settings/RemoteBugreportActivity.java index 1485287dba2..20cc059daa5 100644 --- a/src/com/android/settings/RemoteBugreportActivity.java +++ b/src/com/android/settings/RemoteBugreportActivity.java @@ -20,7 +20,6 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARE_REM import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARE_REMOTE_BUGREPORT_NOT_FINISHED_REQUEST_CONSENT; import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARING_REMOTE_BUGREPORT_MESSAGE; -import android.annotation.Nullable; import android.app.Activity; import android.app.admin.DevicePolicyManager; import android.content.DialogInterface; @@ -29,6 +28,7 @@ import android.os.Bundle; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; /** diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index da15d035862..80f5962d92a 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -16,12 +16,10 @@ package com.android.settings; -import android.annotation.Nullable; import android.app.Activity; import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; import android.provider.Settings; @@ -43,6 +41,7 @@ import android.widget.Spinner; import androidx.activity.result.ActivityResult; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.settings.core.InstrumentedFragment; diff --git a/src/com/android/settings/TouchBlockingFrameLayout.java b/src/com/android/settings/TouchBlockingFrameLayout.java index ca249e23c42..6c77273ad45 100644 --- a/src/com/android/settings/TouchBlockingFrameLayout.java +++ b/src/com/android/settings/TouchBlockingFrameLayout.java @@ -16,12 +16,13 @@ package com.android.settings; -import android.annotation.Nullable; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.FrameLayout; +import androidx.annotation.Nullable; + /** * Extension of FrameLayout that consumes all touch events. */ diff --git a/src/com/android/settings/TrustedCredentialsDialogBuilder.java b/src/com/android/settings/TrustedCredentialsDialogBuilder.java index 9a739915bc0..93d5ebb00cf 100644 --- a/src/com/android/settings/TrustedCredentialsDialogBuilder.java +++ b/src/com/android/settings/TrustedCredentialsDialogBuilder.java @@ -15,7 +15,6 @@ */ package com.android.settings; -import android.annotation.NonNull; import android.app.Activity; import android.app.admin.DevicePolicyManager; import android.content.DialogInterface; @@ -31,6 +30,7 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.Spinner; +import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index 73f1d9e6c77..495065023e4 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -17,7 +17,6 @@ package com.android.settings; import android.annotation.LayoutRes; -import android.annotation.Nullable; import android.app.Dialog; import android.app.settings.SettingsEnums; import android.content.Context; @@ -43,6 +42,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; diff --git a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java index 47c2a957d7b..858b374db75 100644 --- a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java +++ b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java @@ -21,8 +21,7 @@ import static android.provider.Settings.System.KEYBOARD_VIBRATION_ENABLED; import static com.android.settings.accessibility.AccessibilityUtil.State.OFF; import static com.android.settings.accessibility.AccessibilityUtil.State.ON; -import android.annotation.NonNull; -import android.annotation.Nullable; + import android.content.Context; import android.database.ContentObserver; import android.net.Uri; @@ -33,6 +32,8 @@ import android.os.vibrator.Flags; import android.provider.Settings; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.lifecycle.DefaultLifecycleObserver; import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; diff --git a/src/com/android/settings/applications/AppLocaleUtil.java b/src/com/android/settings/applications/AppLocaleUtil.java index 70d284da214..103a2c10033 100644 --- a/src/com/android/settings/applications/AppLocaleUtil.java +++ b/src/com/android/settings/applications/AppLocaleUtil.java @@ -16,7 +16,6 @@ package com.android.settings.applications; -import android.annotation.NonNull; import android.app.LocaleConfig; import android.content.Context; import android.content.Intent; @@ -28,6 +27,7 @@ import android.text.TextUtils; import android.util.FeatureFlagUtils; import android.util.Log; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java b/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java index f3ad32655c6..bb628c96413 100644 --- a/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java +++ b/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java @@ -16,13 +16,15 @@ package com.android.settings.applications; -import android.annotation.NonNull; + import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.NonNull; + import com.android.internal.util.Preconditions; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; diff --git a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java index 58f962ab716..4ed9002d2e2 100644 --- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -16,7 +16,6 @@ package com.android.settings.applications.appops; -import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.os.Bundle; import android.preference.PreferenceFrameLayout; @@ -24,6 +23,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; import androidx.fragment.app.FragmentTransaction; import com.android.settings.R; diff --git a/src/com/android/settings/applications/credentials/CombinedProviderInfo.java b/src/com/android/settings/applications/credentials/CombinedProviderInfo.java index e85413896e5..e7a391eb6d6 100644 --- a/src/com/android/settings/applications/credentials/CombinedProviderInfo.java +++ b/src/com/android/settings/applications/credentials/CombinedProviderInfo.java @@ -16,8 +16,6 @@ package com.android.settings.applications.credentials; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -28,6 +26,9 @@ import android.service.autofill.AutofillServiceInfo; import android.text.TextUtils; import android.util.IconDrawableFactory; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java index b0905bab077..e1862065e03 100644 --- a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java +++ b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java @@ -18,8 +18,6 @@ package com.android.settings.applications.credentials; import static androidx.lifecycle.Lifecycle.Event.ON_CREATE; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.app.Activity; import android.app.Dialog; import android.content.ComponentName; @@ -49,6 +47,8 @@ import android.util.Log; import android.view.View; import android.widget.CompoundButton; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.fragment.app.DialogFragment; diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java index a813ce4f5dd..2637d830481 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java @@ -16,7 +16,6 @@ package com.android.settings.applications.credentials; -import android.annotation.Nullable; import android.app.Activity; import android.app.settings.SettingsEnums; import android.content.Context; @@ -38,6 +37,7 @@ import android.text.Html; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.preference.Preference; diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java b/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java index 47a89ec6497..567bc3141e9 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.applications.credentials; -import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -30,6 +29,7 @@ import android.service.autofill.AutofillServiceInfo; import android.text.TextUtils; import android.view.autofill.AutofillManager; +import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java index 30c79734025..c31fb9e547b 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.applications.defaultapps; import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM; -import android.annotation.Nullable; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -28,6 +27,7 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.Nullable; import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java b/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java index a6e3edf78e9..c43fbd5c40b 100644 --- a/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java +++ b/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java @@ -16,9 +16,10 @@ package com.android.settings.applications.defaultapps; -import android.annotation.Nullable; import android.content.Intent; +import androidx.annotation.Nullable; + /** * Provides an "advanced setting" intent for this app info. */ diff --git a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java index 8169072d868..432b42384ab 100644 --- a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java +++ b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java @@ -17,7 +17,6 @@ package com.android.settings.applications.specialaccess.interactacrossprofiles; import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_WORK_AND_PERSONAL_APPS_TITLE; -import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -32,6 +31,7 @@ import android.util.IconDrawableFactory; import android.util.Pair; import android.view.View; +import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java index 3c90bf358c0..f19b68a6cae 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -17,7 +17,6 @@ package com.android.settings.applications.specialaccess.pictureinpicture; import static android.content.pm.PackageManager.GET_ACTIVITIES; -import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.ActivityInfo; @@ -32,6 +31,7 @@ import android.util.IconDrawableFactory; import android.util.Pair; import android.view.View; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java index c186e07a327..4c9f813fc5e 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -16,7 +16,6 @@ package com.android.settings.applications.specialaccess.premiumsms; -import android.annotation.Nullable; import android.app.Application; import android.app.settings.SettingsEnums; import android.content.Context; @@ -24,6 +23,7 @@ import android.os.Bundle; import android.telephony.SmsManager; import android.view.View; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.DropDownPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java index 40763e3934e..73e1af1bc8a 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java +++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java @@ -24,7 +24,6 @@ import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT import static com.google.android.setupdesign.transition.TransitionHelper.TRANSITION_FADE_THROUGH; -import android.annotation.NonNull; import android.app.Activity; import android.app.admin.DevicePolicyManager; import android.app.settings.SettingsEnums; @@ -45,6 +44,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.util.FrameworkStatsLog; diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java index c9c8cff034c..292d977a274 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollBase.java +++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java @@ -18,7 +18,6 @@ package com.android.settings.biometrics; import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; -import android.annotation.Nullable; import android.annotation.SuppressLint; import android.content.Intent; import android.content.res.ColorStateList; @@ -32,6 +31,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.ColorInt; +import androidx.annotation.Nullable; import com.android.settings.R; import com.android.settings.SetupWizardUtils; diff --git a/src/com/android/settings/biometrics/BiometricEnrollSidecar.java b/src/com/android/settings/biometrics/BiometricEnrollSidecar.java index 369fa4b4311..78f60872186 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollSidecar.java +++ b/src/com/android/settings/biometrics/BiometricEnrollSidecar.java @@ -16,7 +16,6 @@ package com.android.settings.biometrics; -import android.annotation.Nullable; import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -24,6 +23,8 @@ import android.os.CancellationSignal; import android.os.Handler; import android.os.UserHandle; +import androidx.annotation.Nullable; + import com.android.settings.core.InstrumentedFragment; import com.android.settings.password.ChooseLockSettingsHelper; diff --git a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java index 7051b70ee92..e4f25863a8b 100644 --- a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java @@ -16,11 +16,12 @@ package com.android.settings.biometrics; -import android.annotation.Nullable; import android.content.Intent; import android.os.UserHandle; import android.view.View; +import androidx.annotation.Nullable; + import com.android.settings.password.ChooseLockSettingsHelper; /** diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 1b808383244..c7f73cb5b32 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -21,8 +21,6 @@ import static android.text.Layout.HYPHENATION_FREQUENCY_NONE; import android.animation.Animator; import android.animation.ObjectAnimator; import android.annotation.IntDef; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.annotation.RawRes; import android.app.Dialog; import android.app.settings.SettingsEnums; @@ -60,6 +58,8 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java index 99d4ff902f3..2916872e73f 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java @@ -20,7 +20,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.annotation.ColorInt; -import android.annotation.Nullable; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; @@ -29,6 +28,8 @@ import android.view.View; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java index 134462d10c1..73eccdc4564 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java @@ -16,13 +16,14 @@ package com.android.settings.biometrics.fingerprint; -import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.util.Log; +import androidx.annotation.Nullable; + import com.android.settings.core.InstrumentedFragment; import java.util.LinkedList; diff --git a/src/com/android/settings/biometrics/fingerprint/MessageDisplayController.java b/src/com/android/settings/biometrics/fingerprint/MessageDisplayController.java index 11f3ee39062..4dc75b9d375 100644 --- a/src/com/android/settings/biometrics/fingerprint/MessageDisplayController.java +++ b/src/com/android/settings/biometrics/fingerprint/MessageDisplayController.java @@ -16,11 +16,12 @@ package com.android.settings.biometrics.fingerprint; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.hardware.fingerprint.FingerprintManager; import android.os.Handler; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.time.Clock; import java.util.ArrayDeque; import java.util.Deque; diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollHelper.java b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollHelper.java index d3bc97764de..8d1113ee289 100644 --- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollHelper.java +++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollHelper.java @@ -16,8 +16,6 @@ package com.android.settings.biometrics.fingerprint; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.graphics.PointF; import android.hardware.fingerprint.FingerprintManager; @@ -29,6 +27,9 @@ import android.util.Log; import android.util.TypedValue; import android.view.accessibility.AccessibilityManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.settings.core.InstrumentedFragment; import java.util.ArrayList; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index 0cd36d0f471..d5b42118463 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -16,7 +16,8 @@ package com.android.settings.bluetooth; -import android.annotation.Nullable; +import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.Context; @@ -24,11 +25,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.fragment.app.FragmentActivity; -import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - /** * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation * for pairing with a remote Bluetooth device. It is an activity that appears as a dialog. diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java index ebca34250e4..6dd1105569e 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; -import android.annotation.Nullable; import android.app.ActivityManager; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -26,6 +25,8 @@ import android.content.res.Configuration; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.Nullable; + import com.android.settingslib.bluetooth.LocalBluetoothManager; /** diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java index 32ca2777392..d670554a5c2 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java +++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java @@ -18,7 +18,6 @@ package com.android.settings.bluetooth; import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; -import android.annotation.NonNull; import android.app.Activity; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -37,6 +36,7 @@ import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import com.android.settings.R; diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java index f075048384c..2f56f77b078 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java +++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java @@ -286,7 +286,7 @@ public class AudioSharingDeviceVolumeGroupController extends AudioSharingBasePre @Override public void onDeviceVolumeChanged( - @android.annotation.NonNull BluetoothDevice device, + @NonNull BluetoothDevice device, @IntRange(from = -255, to = 255) int volume) { CachedBluetoothDevice cachedDevice = mLocalBtManager.getCachedDeviceManager().findDevice(device); diff --git a/src/com/android/settings/connecteddevice/audiosharing/CallsAndAlarmsPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/CallsAndAlarmsPreferenceController.java index b3d676cbfd8..1a2d52bebb2 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/CallsAndAlarmsPreferenceController.java +++ b/src/com/android/settings/connecteddevice/audiosharing/CallsAndAlarmsPreferenceController.java @@ -16,12 +16,12 @@ package com.android.settings.connecteddevice.audiosharing; -import android.annotation.Nullable; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java index 0d3b1b12ff3..b2e6fb20f72 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java +++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java @@ -16,12 +16,13 @@ package com.android.settings.connecteddevice.audiosharing.audiostreams; -import android.annotation.Nullable; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.Nullable; + import com.android.settings.bluetooth.Utils; import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils; import com.android.settingslib.bluetooth.BluetoothCallback; diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java index f47526f5fa6..56d0fa7b9e5 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java +++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java @@ -16,12 +16,12 @@ package com.android.settings.connecteddevice.audiosharing.audiostreams; -import android.annotation.Nullable; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.lifecycle.LifecycleOwner; import com.android.settings.bluetooth.Utils; diff --git a/src/com/android/settings/connecteddevice/dock/DockUpdater.java b/src/com/android/settings/connecteddevice/dock/DockUpdater.java index 99ac12475bc..1bc3c56533c 100644 --- a/src/com/android/settings/connecteddevice/dock/DockUpdater.java +++ b/src/com/android/settings/connecteddevice/dock/DockUpdater.java @@ -15,9 +15,10 @@ */ package com.android.settings.connecteddevice.dock; -import android.annotation.NonNull; import android.content.Context; +import androidx.annotation.NonNull; + /** * Update the dock devices. It notifies the upper level whether to add/remove the preference * through {@link DevicePreferenceCallback} diff --git a/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java b/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java index d1407aeeb61..5d30f7e2093 100644 --- a/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java @@ -16,9 +16,10 @@ package com.android.settings.connecteddevice.fastpair; -import android.annotation.Nullable; import android.content.Context; +import androidx.annotation.Nullable; + /** * Updates the Fast Pair devices. It notifies the upper level whether to add/remove the preference * through {@link DevicePreferenceCallback} diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java index 2f8b5c34696..d194499c88c 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java +++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java @@ -22,7 +22,6 @@ import static android.service.usb.UsbPortStatusProto.DATA_ROLE_HOST; import static android.service.usb.UsbPortStatusProto.DATA_ROLE_NONE; import static android.service.usb.UsbPortStatusProto.POWER_ROLE_SINK; -import android.annotation.Nullable; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.usb.UsbManager; @@ -32,6 +31,7 @@ import android.net.TetheringManager; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import java.util.List; diff --git a/src/com/android/settings/core/CategoryMixin.java b/src/com/android/settings/core/CategoryMixin.java index 151ed7b47f2..5f9fc00b74e 100644 --- a/src/com/android/settings/core/CategoryMixin.java +++ b/src/com/android/settings/core/CategoryMixin.java @@ -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; diff --git a/src/com/android/settings/core/PreferenceControllerListHelper.java b/src/com/android/settings/core/PreferenceControllerListHelper.java index 6d450fe137f..f37140eaaf6 100644 --- a/src/com/android/settings/core/PreferenceControllerListHelper.java +++ b/src/com/android/settings/core/PreferenceControllerListHelper.java @@ -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; diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java index acb1d34e291..df3cd922752 100644 --- a/src/com/android/settings/core/PreferenceXmlParserUtils.java +++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java @@ -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; diff --git a/src/com/android/settings/datausage/MeasurableLinearLayout.java b/src/com/android/settings/datausage/MeasurableLinearLayout.java index f165be7f58d..7fd392c8983 100644 --- a/src/com/android/settings/datausage/MeasurableLinearLayout.java +++ b/src/com/android/settings/datausage/MeasurableLinearLayout.java @@ -1,11 +1,12 @@ package com.android.settings.datausage; -import android.annotation.Nullable; import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; +import androidx.annotation.Nullable; + public class MeasurableLinearLayout extends LinearLayout { private View mFixedView; private View mDisposableView; diff --git a/src/com/android/settings/datausage/SpinnerPreference.java b/src/com/android/settings/datausage/SpinnerPreference.java index c81ac550d97..febdead8ea0 100644 --- a/src/com/android/settings/datausage/SpinnerPreference.java +++ b/src/com/android/settings/datausage/SpinnerPreference.java @@ -14,13 +14,13 @@ package com.android.settings.datausage; -import android.annotation.Nullable; import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.AdapterView; import android.widget.Spinner; +import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/settings/development/BackAnimationPreferenceController.java b/src/com/android/settings/development/BackAnimationPreferenceController.java index 8c731a46b13..ed638963258 100644 --- a/src/com/android/settings/development/BackAnimationPreferenceController.java +++ b/src/com/android/settings/development/BackAnimationPreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.development; import static com.android.window.flags.Flags.predictiveBackSystemAnimations; -import android.annotation.Nullable; import android.content.Context; import android.provider.Settings; +import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java b/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java index 24257688d27..ab65139b719 100644 --- a/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java +++ b/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java @@ -16,13 +16,13 @@ package com.android.settings.development; -import android.annotation.Nullable; import android.content.Context; import android.hardware.dumpstate.V1_0.IDumpstateDevice; import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java index 96842821521..33badd1dec1 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java @@ -14,9 +14,11 @@ * limitations under the License. */ package com.android.settings.development.graphicsdriver; -import android.annotation.NonNull; -import android.annotation.Nullable; + import android.os.SystemProperties; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Wrapper interface to access {@link SystemProperties}. * diff --git a/src/com/android/settings/development/tare/AlarmManagerFragment.java b/src/com/android/settings/development/tare/AlarmManagerFragment.java index 9b9eded98cf..b55c7cf3ed2 100644 --- a/src/com/android/settings/development/tare/AlarmManagerFragment.java +++ b/src/com/android/settings/development/tare/AlarmManagerFragment.java @@ -15,7 +15,6 @@ */ package com.android.settings.development.tare; -import android.annotation.Nullable; import android.app.Fragment; import android.app.tare.EconomyManager; import android.content.res.Resources; @@ -26,6 +25,8 @@ import android.view.ViewGroup; import android.widget.ExpandableListView; import android.widget.ExpandableListView.OnChildClickListener; +import androidx.annotation.Nullable; + import com.android.settings.R; /** diff --git a/src/com/android/settings/development/tare/JobSchedulerFragment.java b/src/com/android/settings/development/tare/JobSchedulerFragment.java index e3b36a5dc02..7f5e6638e55 100644 --- a/src/com/android/settings/development/tare/JobSchedulerFragment.java +++ b/src/com/android/settings/development/tare/JobSchedulerFragment.java @@ -15,7 +15,6 @@ */ package com.android.settings.development.tare; -import android.annotation.Nullable; import android.app.Fragment; import android.app.tare.EconomyManager; import android.content.res.Resources; @@ -26,6 +25,8 @@ import android.view.ViewGroup; import android.widget.ExpandableListView; import android.widget.ExpandableListView.OnChildClickListener; +import androidx.annotation.Nullable; + import com.android.settings.R; /** diff --git a/src/com/android/settings/development/tare/TareFactorController.java b/src/com/android/settings/development/tare/TareFactorController.java index b5dd6ea677c..3407b7b85c1 100644 --- a/src/com/android/settings/development/tare/TareFactorController.java +++ b/src/com/android/settings/development/tare/TareFactorController.java @@ -25,7 +25,6 @@ import static android.app.tare.EconomyManager.parseCreditValue; import static android.provider.Settings.Global.TARE_ALARM_MANAGER_CONSTANTS; import static android.provider.Settings.Global.TARE_JOB_SCHEDULER_CONSTANTS; -import android.annotation.NonNull; import android.app.tare.EconomyManager; import android.content.ContentResolver; import android.content.Context; @@ -40,6 +39,8 @@ import android.util.ArraySet; import android.util.KeyValueListParser; import android.util.Slog; +import androidx.annotation.NonNull; + import com.android.settings.R; /** diff --git a/src/com/android/settings/development/tare/TareFactorDialogFragment.java b/src/com/android/settings/development/tare/TareFactorDialogFragment.java index 6d2f5ca3713..269e2094b32 100644 --- a/src/com/android/settings/development/tare/TareFactorDialogFragment.java +++ b/src/com/android/settings/development/tare/TareFactorDialogFragment.java @@ -18,7 +18,6 @@ package com.android.settings.development.tare; import static android.app.tare.EconomyManager.CAKE_IN_ARC; -import android.annotation.NonNull; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; @@ -33,6 +32,8 @@ import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.Spinner; +import androidx.annotation.NonNull; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java b/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java index 79b7d41f9ec..9c78d068f7c 100644 --- a/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java +++ b/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java @@ -18,7 +18,6 @@ package com.android.settings.development.tare; import static android.app.tare.EconomyManager.CAKE_IN_ARC; -import android.annotation.NonNull; import android.annotation.SuppressLint; import android.view.LayoutInflater; import android.view.View; @@ -26,6 +25,8 @@ import android.view.ViewGroup; import android.widget.BaseExpandableListAdapter; import android.widget.TextView; +import androidx.annotation.NonNull; + import com.android.settings.R; /** diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index ba0cd33fa07..bb9a78193ba 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -20,7 +20,6 @@ import static android.os.storage.DiskInfo.EXTRA_DISK_ID; import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID; import android.annotation.LayoutRes; -import android.annotation.NonNull; import android.content.Intent; import android.content.res.Resources.Theme; import android.graphics.drawable.Drawable; @@ -38,6 +37,7 @@ import android.widget.FrameLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index a74c4260ac8..6ac0d267f02 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo.simstatus; import static androidx.lifecycle.Lifecycle.Event; -import android.annotation.Nullable; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -54,6 +53,7 @@ import android.text.TextUtils; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; diff --git a/src/com/android/settings/deviceinfo/storage/StorageEntry.java b/src/com/android/settings/deviceinfo/storage/StorageEntry.java index b419370e22b..38b2c33828c 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageEntry.java +++ b/src/com/android/settings/deviceinfo/storage/StorageEntry.java @@ -16,7 +16,6 @@ package com.android.settings.deviceinfo.storage; -import android.annotation.NonNull; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; @@ -26,6 +25,8 @@ import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.text.TextUtils; +import androidx.annotation.NonNull; + import com.android.settings.R; import java.io.File; diff --git a/src/com/android/settings/display/ScreenResolutionFragment.java b/src/com/android/settings/display/ScreenResolutionFragment.java index 622e665fe0f..a2ad25ff96d 100644 --- a/src/com/android/settings/display/ScreenResolutionFragment.java +++ b/src/com/android/settings/display/ScreenResolutionFragment.java @@ -16,7 +16,6 @@ package com.android.settings.display; -import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Resources; @@ -30,6 +29,7 @@ import android.view.Display; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index 0f4634ea4c2..9fc51ac0cdc 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -18,7 +18,6 @@ package com.android.settings.enterprise; import static android.app.admin.DevicePolicyResources.Strings.Settings.DISABLED_BY_IT_ADMIN_TITLE; -import android.annotation.NonNull; import android.annotation.UserIdInt; import android.app.Activity; import android.app.admin.DevicePolicyManager; @@ -33,6 +32,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; diff --git a/src/com/android/settings/fuelgauge/BatteryActiveView.java b/src/com/android/settings/fuelgauge/BatteryActiveView.java index a9aa6a4327c..969bf63b802 100644 --- a/src/com/android/settings/fuelgauge/BatteryActiveView.java +++ b/src/com/android/settings/fuelgauge/BatteryActiveView.java @@ -14,7 +14,6 @@ package com.android.settings.fuelgauge; -import android.annotation.Nullable; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; @@ -22,6 +21,8 @@ import android.util.AttributeSet; import android.util.SparseIntArray; import android.view.View; +import androidx.annotation.Nullable; + public class BatteryActiveView extends View { private final Paint mPaint = new Paint(); diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java index ecd8a1b2093..a041a31d444 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -16,12 +16,12 @@ package com.android.settings.fuelgauge; -import android.annotation.Nullable; import android.content.Context; import android.graphics.ColorFilter; import android.util.AttributeSet; import android.widget.ImageView; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java index 57dd5784a81..31cec6a46ba 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java @@ -16,13 +16,13 @@ package com.android.settings.fuelgauge.batterytip; -import android.annotation.Nullable; import android.content.Context; import android.os.BadParcelableException; import android.os.Bundle; import android.util.ArrayMap; import android.util.Log; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java index e23e2190a18..002c8075d03 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java @@ -16,7 +16,6 @@ package com.android.settings.fuelgauge.batteryusage; import android.annotation.IntDef; -import android.annotation.Nullable; import android.app.usage.IUsageStatsManager; import android.app.usage.UsageEvents.Event; import android.app.usage.UsageStatsManager; @@ -34,6 +33,7 @@ import android.util.Base64; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.settings.fuelgauge.BatteryUtils; diff --git a/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java b/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java index 2d09e6b029f..b3a72d0bd37 100644 --- a/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java +++ b/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java @@ -18,8 +18,6 @@ package com.android.settings.gestures; import android.animation.TimeAnimator; import android.annotation.IntRange; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.graphics.Canvas; import android.graphics.ColorFilter; @@ -30,6 +28,9 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java b/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java index f556018a085..57e6d6f9904 100644 --- a/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java +++ b/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java @@ -16,10 +16,10 @@ package com.android.settings.homepage.contextualcards; -import android.annotation.NonNull; import android.content.Context; import android.util.Log; +import androidx.annotation.NonNull; import androidx.collection.ArraySet; import androidx.lifecycle.LifecycleOwner; diff --git a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java index 3e6659f0eb6..509014cba2d 100644 --- a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java +++ b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java @@ -16,7 +16,7 @@ package com.android.settings.homepage.contextualcards; -import android.annotation.Nullable; +import androidx.annotation.Nullable; import com.android.settings.intelligence.ContextualCardProto.ContextualCard; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; diff --git a/src/com/android/settings/inputmethod/UserDictionarySettings.java b/src/com/android/settings/inputmethod/UserDictionarySettings.java index 27a62a982bf..16a2299c424 100644 --- a/src/com/android/settings/inputmethod/UserDictionarySettings.java +++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java @@ -16,7 +16,6 @@ package com.android.settings.inputmethod; -import android.annotation.Nullable; import android.app.ActionBar; import android.app.settings.SettingsEnums; import android.content.ContentResolver; @@ -39,6 +38,7 @@ import android.widget.SectionIndexer; import android.widget.SimpleCursorAdapter; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.fragment.app.ListFragment; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; diff --git a/src/com/android/settings/network/ActiveSubscriptionsListener.java b/src/com/android/settings/network/ActiveSubscriptionsListener.java index dce441be3dc..49675388b14 100644 --- a/src/com/android/settings/network/ActiveSubscriptionsListener.java +++ b/src/com/android/settings/network/ActiveSubscriptionsListener.java @@ -16,7 +16,6 @@ package com.android.settings.network; -import android.annotation.NonNull; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -30,6 +29,7 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import com.android.internal.telephony.TelephonyIntents; diff --git a/src/com/android/settings/network/CarrierConfigCache.java b/src/com/android/settings/network/CarrierConfigCache.java index 30374f57f85..35b65c844f8 100644 --- a/src/com/android/settings/network/CarrierConfigCache.java +++ b/src/com/android/settings/network/CarrierConfigCache.java @@ -20,7 +20,6 @@ import static android.telephony.CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANG import static android.telephony.SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX; import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; -import android.annotation.NonNull; import android.annotation.TestApi; import android.content.BroadcastReceiver; import android.content.Context; @@ -32,6 +31,7 @@ import android.telephony.SubscriptionManager; import android.util.Log; import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import java.util.Map; diff --git a/src/com/android/settings/network/InternetUpdater.java b/src/com/android/settings/network/InternetUpdater.java index bc24f866c80..11e9eddbdee 100644 --- a/src/com/android/settings/network/InternetUpdater.java +++ b/src/com/android/settings/network/InternetUpdater.java @@ -24,7 +24,6 @@ import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; -import android.annotation.NonNull; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -37,6 +36,7 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.util.Log; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java index af37d249c4c..b0c85fcfdfc 100644 --- a/src/com/android/settings/network/MobileNetworkRepository.java +++ b/src/com/android/settings/network/MobileNetworkRepository.java @@ -18,7 +18,6 @@ package com.android.settings.network; import static android.telephony.SubscriptionManager.PROFILE_CLASS_PROVISIONING; import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT; -import android.annotation.NonNull; import android.app.settings.SettingsEnums; import android.content.Context; import android.database.ContentObserver; @@ -38,6 +37,7 @@ import android.util.IndentingPrintWriter; import android.util.Log; import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; import com.android.internal.telephony.flags.Flags; diff --git a/src/com/android/settings/network/ProxySubscriptionManager.java b/src/com/android/settings/network/ProxySubscriptionManager.java index 51fafb17ee8..7e276e889be 100644 --- a/src/com/android/settings/network/ProxySubscriptionManager.java +++ b/src/com/android/settings/network/ProxySubscriptionManager.java @@ -20,7 +20,6 @@ import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; -import android.annotation.NonNull; import android.content.Context; import android.os.Looper; import android.provider.Settings; @@ -29,6 +28,7 @@ import android.telephony.SubscriptionManager; import android.util.Log; import androidx.annotation.Keep; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java index e416760633c..ca498236fe0 100644 --- a/src/com/android/settings/network/SubscriptionUtil.java +++ b/src/com/android/settings/network/SubscriptionUtil.java @@ -22,7 +22,6 @@ import static android.telephony.SubscriptionManager.PROFILE_CLASS_PROVISIONING; import static com.android.internal.util.CollectionUtils.emptyIfNull; -import android.annotation.Nullable; import android.content.Context; import android.content.SharedPreferences; import android.os.ParcelUuid; @@ -39,6 +38,7 @@ import android.text.TextUtils; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.internal.telephony.MccTable; diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index 38f659603fe..c1a05f1c062 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -31,7 +31,6 @@ import static com.android.settings.network.telephony.TelephonyConstants.Telephon import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO; import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA; -import android.annotation.Nullable; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -69,6 +68,7 @@ import android.text.TextUtils; import android.util.Log; import android.view.Gravity; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.internal.util.ArrayUtils; diff --git a/src/com/android/settings/notification/AppBubbleListPreferenceController.java b/src/com/android/settings/notification/AppBubbleListPreferenceController.java index bf7fcc03756..377cb463460 100644 --- a/src/com/android/settings/notification/AppBubbleListPreferenceController.java +++ b/src/com/android/settings/notification/AppBubbleListPreferenceController.java @@ -21,7 +21,6 @@ import static android.app.NotificationManager.BUBBLE_PREFERENCE_ALL; import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE; import static android.app.NotificationManager.BUBBLE_PREFERENCE_SELECTED; -import android.annotation.Nullable; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; import android.content.Context; @@ -31,6 +30,7 @@ import android.service.notification.ConversationChannelWrapper; import android.view.View; import android.widget.ImageView; +import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java index 9ea8c58024f..3f300c0fce3 100644 --- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java +++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java @@ -24,7 +24,6 @@ import static com.android.internal.notification.NotificationAccessConfirmationAc import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_USER_ID; import android.Manifest; -import android.annotation.Nullable; import android.app.Activity; import android.app.NotificationManager; import android.app.admin.DevicePolicyManager; @@ -44,6 +43,8 @@ import android.view.WindowManager; import android.view.accessibility.AccessibilityEvent; import android.widget.Toast; +import androidx.annotation.Nullable; + import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index e2ef0ddccb4..6f16e56a43d 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -19,7 +19,6 @@ package com.android.settings.notification; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_APPS_CANNOT_ACCESS_NOTIFICATION_SETTINGS; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED; -import android.annotation.Nullable; import android.app.NotificationManager; import android.app.admin.DevicePolicyManager; import android.app.settings.SettingsEnums; @@ -40,6 +39,7 @@ import android.util.Log; import android.view.View; import android.widget.Toast; +import androidx.annotation.Nullable; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/app/BubblePreferenceController.java b/src/com/android/settings/notification/app/BubblePreferenceController.java index f2c5cdde2ee..3bbb059fb1d 100644 --- a/src/com/android/settings/notification/app/BubblePreferenceController.java +++ b/src/com/android/settings/notification/app/BubblePreferenceController.java @@ -19,11 +19,11 @@ package com.android.settings.notification.app; import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE; import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; -import android.annotation.Nullable; import android.app.NotificationChannel; import android.content.Context; import android.provider.Settings; +import androidx.annotation.Nullable; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; diff --git a/src/com/android/settings/notification/app/NotificationPreferenceController.java b/src/com/android/settings/notification/app/NotificationPreferenceController.java index fb19d9d6b4c..ef4bab97796 100644 --- a/src/com/android/settings/notification/app/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/app/NotificationPreferenceController.java @@ -17,21 +17,18 @@ package com.android.settings.notification.app; import static android.app.NotificationManager.IMPORTANCE_NONE; -import static android.os.UserHandle.USER_SYSTEM; -import android.annotation.Nullable; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ShortcutInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; -import android.provider.Settings; import android.util.Log; +import androidx.annotation.Nullable; import androidx.preference.Preference; import com.android.settings.notification.NotificationBackend; diff --git a/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java b/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java index 224c31d1f55..5923a4e8dbf 100644 --- a/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java +++ b/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java @@ -2,13 +2,13 @@ package com.android.settings.notification.history; import static android.view.HapticFeedbackConstants.CLOCK_TICK; -import android.annotation.Nullable; import android.content.Context; import android.graphics.Canvas; import android.util.AttributeSet; import android.view.View; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/src/com/android/settings/notification/zen/ZenAccessSettings.java b/src/com/android/settings/notification/zen/ZenAccessSettings.java index aac695435ab..418a5719b8a 100644 --- a/src/com/android/settings/notification/zen/ZenAccessSettings.java +++ b/src/com/android/settings/notification/zen/ZenAccessSettings.java @@ -16,7 +16,6 @@ package com.android.settings.notification.zen; -import android.annotation.Nullable; import android.app.NotificationManager; import android.app.settings.SettingsEnums; import android.content.Context; @@ -30,6 +29,7 @@ import android.util.ArraySet; import android.util.Log; import android.view.View; +import androidx.annotation.Nullable; import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index 21fd94c554c..e74b7767faa 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -18,8 +18,6 @@ package com.android.settings.password; import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityOptions; import android.app.KeyguardManager; @@ -33,6 +31,8 @@ import android.os.UserManager; import android.util.Log; import androidx.activity.result.ActivityResultLauncher; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java index ea00f7f4931..2af360a1215 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java @@ -22,7 +22,6 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; -import android.annotation.Nullable; import android.app.Dialog; import android.app.KeyguardManager; import android.app.RemoteLockscreenValidationSession; @@ -48,6 +47,7 @@ import android.widget.Button; import android.widget.CheckBox; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java index b139ae9a9f2..b9b1810da25 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/src/com/android/settings/password/ConfirmLockPassword.java @@ -26,7 +26,6 @@ import static com.android.settings.biometrics.GatekeeperPasswordProvider.contain import static com.android.settings.biometrics.GatekeeperPasswordProvider.getGatekeeperPasswordHandle; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE; -import android.annotation.Nullable; import android.app.KeyguardManager; import android.app.RemoteLockscreenValidationResult; import android.app.admin.DevicePolicyManager; @@ -57,6 +56,7 @@ import android.widget.ImeAwareEditText; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; +import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import com.android.internal.widget.LockPatternChecker; diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java index 6e3ad30a2f9..3415478c912 100644 --- a/src/com/android/settings/password/ConfirmLockPattern.java +++ b/src/com/android/settings/password/ConfirmLockPattern.java @@ -24,7 +24,6 @@ import static com.android.settings.biometrics.GatekeeperPasswordProvider.contain import static com.android.settings.biometrics.GatekeeperPasswordProvider.getGatekeeperPasswordHandle; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE; -import android.annotation.Nullable; import android.annotation.SuppressLint; import android.app.Activity; import android.app.KeyguardManager; @@ -46,6 +45,8 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LockPatternChecker; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java index 0d8f02e8e52..7cf6a00ea62 100644 --- a/src/com/android/settings/password/PasswordRequirementAdapter.java +++ b/src/com/android/settings/password/PasswordRequirementAdapter.java @@ -16,13 +16,13 @@ package com.android.settings.password; -import android.annotation.NonNull; import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; diff --git a/src/com/android/settings/password/PasswordUtils.java b/src/com/android/settings/password/PasswordUtils.java index 4bdc3240322..a54df94fa90 100644 --- a/src/com/android/settings/password/PasswordUtils.java +++ b/src/com/android/settings/password/PasswordUtils.java @@ -18,7 +18,6 @@ package com.android.settings.password; import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; -import android.annotation.Nullable; import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Context; @@ -33,6 +32,8 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java index ef8a15a1ac7..aa8fe5168bc 100644 --- a/src/com/android/settings/password/SetNewPasswordController.java +++ b/src/com/android/settings/password/SetNewPasswordController.java @@ -22,7 +22,6 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT import static com.android.internal.util.Preconditions.checkNotNull; -import android.annotation.Nullable; import android.app.ActivityManager; import android.app.admin.DevicePolicyManager; import android.content.Context; @@ -34,6 +33,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.UserManager; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.settings.Utils; diff --git a/src/com/android/settings/print/SettingsPrintServicesLoader.java b/src/com/android/settings/print/SettingsPrintServicesLoader.java index e94c589d4bb..5956d896362 100644 --- a/src/com/android/settings/print/SettingsPrintServicesLoader.java +++ b/src/com/android/settings/print/SettingsPrintServicesLoader.java @@ -16,12 +16,12 @@ package com.android.settings.print; -import android.annotation.NonNull; import android.content.Context; import android.print.PrintManager; import android.print.PrintServicesLoader; import android.printservice.PrintServiceInfo; +import androidx.annotation.NonNull; import androidx.loader.content.Loader; import com.android.internal.util.Preconditions; diff --git a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java index 5377f15484e..c3830c19d82 100644 --- a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java +++ b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java @@ -16,11 +16,12 @@ package com.android.settings.privacy; -import android.annotation.NonNull; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.NonNull; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.utils.ContentCaptureUtils; diff --git a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java index fcb2347f5b0..c8a54712067 100644 --- a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java +++ b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.privacy; -import android.annotation.NonNull; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -26,6 +25,7 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/privacy/PrivacyHubPreferenceController.java b/src/com/android/settings/privacy/PrivacyHubPreferenceController.java index 0de4f06c89c..b68b5ec7d0e 100644 --- a/src/com/android/settings/privacy/PrivacyHubPreferenceController.java +++ b/src/com/android/settings/privacy/PrivacyHubPreferenceController.java @@ -16,10 +16,11 @@ package com.android.settings.privacy; -import android.annotation.NonNull; import android.content.Context; import android.provider.DeviceConfig; +import androidx.annotation.NonNull; + import com.android.settings.core.BasePreferenceController; /** diff --git a/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java b/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java index b5532394aa2..8014104e983 100644 --- a/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java +++ b/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.privacy; -import android.annotation.NonNull; import android.content.Context; +import androidx.annotation.NonNull; + import com.android.settings.core.BasePreferenceController; import com.android.settings.safetycenter.SafetyCenterManagerWrapper; diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java index 9262ba8cb7f..0741ce4b02c 100644 --- a/src/com/android/settings/search/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -18,7 +18,6 @@ package com.android.settings.search; import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO; -import android.annotation.NonNull; import android.app.ActivityOptions; import android.content.ComponentName; import android.content.Context; @@ -30,6 +29,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toolbar; +import androidx.annotation.NonNull; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 453832ddc07..74494210d35 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -16,7 +16,6 @@ package com.android.settings.search.actionbar; -import android.annotation.NonNull; import android.app.Activity; import android.app.settings.SettingsEnums; import android.content.Intent; @@ -26,6 +25,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import com.android.settings.R; diff --git a/src/com/android/settings/security/InstallCaCertificateWarning.java b/src/com/android/settings/security/InstallCaCertificateWarning.java index 7775f836013..3335fe61d60 100644 --- a/src/com/android/settings/security/InstallCaCertificateWarning.java +++ b/src/com/android/settings/security/InstallCaCertificateWarning.java @@ -18,7 +18,6 @@ package com.android.settings.security; import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; -import android.annotation.Nullable; import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -26,6 +25,8 @@ import android.security.Credentials; import android.view.View; import android.widget.Toast; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.SetupWizardUtils; diff --git a/src/com/android/settings/security/RequestManageCredentials.java b/src/com/android/settings/security/RequestManageCredentials.java index 6a1d40aef7a..2c1b45219d0 100644 --- a/src/com/android/settings/security/RequestManageCredentials.java +++ b/src/com/android/settings/security/RequestManageCredentials.java @@ -18,7 +18,6 @@ package com.android.settings.security; import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; -import android.annotation.Nullable; import android.app.Activity; import android.app.admin.DevicePolicyEventLogger; import android.app.admin.DevicePolicyManager; @@ -47,6 +46,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/src/com/android/settings/slices/SliceBackgroundWorker.java b/src/com/android/settings/slices/SliceBackgroundWorker.java index 5145f1809e5..1cf00de3e6d 100644 --- a/src/com/android/settings/slices/SliceBackgroundWorker.java +++ b/src/com/android/settings/slices/SliceBackgroundWorker.java @@ -17,7 +17,6 @@ package com.android.settings.slices; import android.annotation.MainThread; -import android.annotation.Nullable; import android.content.Context; import android.net.Uri; import android.os.Handler; @@ -29,6 +28,7 @@ import android.os.SystemClock; import android.util.ArrayMap; import android.util.Log; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import java.io.Closeable; diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index b570b2dff97..b785210f973 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -20,7 +20,6 @@ import static android.media.AudioManager.STREAM_DEVICES_CHANGED_ACTION; import static com.android.settingslib.media.flags.Flags.enableOutputSwitcherForSystemRouting; -import android.annotation.Nullable; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.Context; @@ -38,6 +37,7 @@ import android.os.Looper; import android.util.FeatureFlagUtils; import android.util.Log; +import androidx.annotation.Nullable; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index 47be7fe9bd3..c85789dbed8 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.sound; import static com.android.settingslib.media.flags.Flags.enableOutputSwitcherForSystemRouting; -import android.annotation.Nullable; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.Intent; @@ -27,6 +26,7 @@ import android.media.session.MediaController; import android.media.session.MediaSessionManager; import android.text.TextUtils; +import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/support/actionbar/HelpMenuController.java b/src/com/android/settings/support/actionbar/HelpMenuController.java index 498cc3ed529..7e1f460e158 100644 --- a/src/com/android/settings/support/actionbar/HelpMenuController.java +++ b/src/com/android/settings/support/actionbar/HelpMenuController.java @@ -18,12 +18,12 @@ package com.android.settings.support.actionbar; import static com.android.settings.support.actionbar.HelpResourceProvider.HELP_URI_RESOURCE_KEY; -import android.annotation.NonNull; import android.app.Activity; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; +import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import com.android.settingslib.HelpUtils; diff --git a/src/com/android/settings/utils/ContentCaptureUtils.java b/src/com/android/settings/utils/ContentCaptureUtils.java index b01749f0c5e..2445e87f3e9 100644 --- a/src/com/android/settings/utils/ContentCaptureUtils.java +++ b/src/com/android/settings/utils/ContentCaptureUtils.java @@ -16,8 +16,6 @@ package com.android.settings.utils; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; import android.os.IBinder; @@ -27,6 +25,9 @@ import android.provider.Settings; import android.util.Log; import android.view.contentcapture.ContentCaptureManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public final class ContentCaptureUtils { private static final String TAG = ContentCaptureUtils.class.getSimpleName(); diff --git a/src/com/android/settings/utils/FileSizeFormatter.java b/src/com/android/settings/utils/FileSizeFormatter.java index 9ef0fe256fd..5950d5d0ce6 100644 --- a/src/com/android/settings/utils/FileSizeFormatter.java +++ b/src/com/android/settings/utils/FileSizeFormatter.java @@ -16,8 +16,6 @@ package com.android.settings.utils; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.icu.text.DecimalFormat; import android.icu.text.MeasureFormat; @@ -28,6 +26,9 @@ import android.text.BidiFormatter; import android.text.TextUtils; import android.view.View; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.math.BigDecimal; import java.util.Locale; diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index 4ee229eb721..d5f00408fd5 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -18,7 +18,6 @@ package com.android.settings.utils; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED; -import android.annotation.Nullable; import android.app.Dialog; import android.app.admin.DevicePolicyManager; import android.app.settings.SettingsEnums; @@ -34,6 +33,7 @@ import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index 1d5b3cc6d51..00c8f5994ce 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -18,7 +18,6 @@ package com.android.settings.vpn2; import static android.app.AppOpsManager.OP_ACTIVATE_PLATFORM_VPN; import static android.app.AppOpsManager.OP_ACTIVATE_VPN; -import android.annotation.NonNull; import android.app.AppOpsManager; import android.app.Dialog; import android.app.admin.DevicePolicyManager; @@ -35,6 +34,7 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; diff --git a/src/com/android/settings/vpn2/AppVpnInfo.java b/src/com/android/settings/vpn2/AppVpnInfo.java index f225470564f..be938a6529f 100644 --- a/src/com/android/settings/vpn2/AppVpnInfo.java +++ b/src/com/android/settings/vpn2/AppVpnInfo.java @@ -1,6 +1,6 @@ package com.android.settings.vpn2; -import android.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.internal.util.Preconditions; diff --git a/src/com/android/settings/widget/BottomLabelLayout.java b/src/com/android/settings/widget/BottomLabelLayout.java index a267de04a5b..64f27aa822c 100644 --- a/src/com/android/settings/widget/BottomLabelLayout.java +++ b/src/com/android/settings/widget/BottomLabelLayout.java @@ -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; /** diff --git a/src/com/android/settings/widget/EmptyTextSettings.java b/src/com/android/settings/widget/EmptyTextSettings.java index a6e5c60ce8e..ddd13701757 100644 --- a/src/com/android/settings/widget/EmptyTextSettings.java +++ b/src/com/android/settings/widget/EmptyTextSettings.java @@ -16,7 +16,6 @@ package com.android.settings.widget; -import android.annotation.Nullable; import android.os.Bundle; import android.util.TypedValue; import android.view.Gravity; @@ -25,6 +24,8 @@ 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; diff --git a/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java b/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java index 271378a3c47..3fee01ffdbe 100644 --- a/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java +++ b/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java @@ -17,8 +17,6 @@ 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; @@ -30,6 +28,9 @@ 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; diff --git a/src/com/android/settings/widget/TintDrawable.java b/src/com/android/settings/widget/TintDrawable.java index 13eb1211da7..7b348905217 100644 --- a/src/com/android/settings/widget/TintDrawable.java +++ b/src/com/android/settings/widget/TintDrawable.java @@ -16,15 +16,16 @@ 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 android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.settings.R; diff --git a/src/com/android/settings/widget/UsageGraph.java b/src/com/android/settings/widget/UsageGraph.java index 78dcd7a5a14..c92ea1bdf1b 100644 --- a/src/com/android/settings/widget/UsageGraph.java +++ b/src/com/android/settings/widget/UsageGraph.java @@ -16,7 +16,6 @@ package com.android.settings.widget; -import android.annotation.Nullable; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; @@ -35,6 +34,7 @@ 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; diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 33f2827d7f8..2b3bedbe55f 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -15,7 +15,6 @@ */ package com.android.settings.wifi; -import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; @@ -28,6 +27,7 @@ import android.util.Log; import android.view.View; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/wifi/WifiEntryPreference.java b/src/com/android/settings/wifi/WifiEntryPreference.java index e1add1585a9..e5290f41fea 100644 --- a/src/com/android/settings/wifi/WifiEntryPreference.java +++ b/src/com/android/settings/wifi/WifiEntryPreference.java @@ -17,7 +17,6 @@ package com.android.settings.wifi; import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource; -import android.annotation.Nullable; import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -31,6 +30,7 @@ import android.widget.TextView; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java index 215c6b05848..210e94cb13b 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java @@ -16,7 +16,6 @@ package com.android.settings.wifi.dpp; -import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Intent; @@ -40,6 +39,8 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.chooser.DisplayResolveInfo; import com.android.internal.app.chooser.TargetInfo; diff --git a/src/com/android/settings/wifi/factory/WifiFeatureProvider.java b/src/com/android/settings/wifi/factory/WifiFeatureProvider.java index 9e7365ee309..5ab899afdc5 100644 --- a/src/com/android/settings/wifi/factory/WifiFeatureProvider.java +++ b/src/com/android/settings/wifi/factory/WifiFeatureProvider.java @@ -16,13 +16,13 @@ package com.android.settings.wifi.factory; -import android.annotation.Nullable; import android.content.Context; import android.net.TetheringManager; import android.net.wifi.WifiManager; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelStoreOwner; diff --git a/src/com/android/settings/wifi/factory/WifiVerboseLogging.java b/src/com/android/settings/wifi/factory/WifiVerboseLogging.java index 2935ed49e74..0be3bc00c31 100644 --- a/src/com/android/settings/wifi/factory/WifiVerboseLogging.java +++ b/src/com/android/settings/wifi/factory/WifiVerboseLogging.java @@ -16,12 +16,12 @@ package com.android.settings.wifi.factory; -import android.annotation.Nullable; import android.content.Context; import android.net.wifi.WifiManager; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Wi-Fi Verbose Logging diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 908ccdcc845..0baac2c063a 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -21,13 +21,13 @@ import static android.net.wifi.WifiManager.SAP_START_FAILURE_GENERAL; import static com.android.settings.wifi.WifiUtils.canShowWifiHotspot; -import android.annotation.NonNull; import android.content.Context; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiClient; import android.net.wifi.WifiManager; import android.text.BidiFormatter; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java index 41b6dd939bf..6f59411cd31 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -16,13 +16,13 @@ package com.android.settings.wifi.tether; -import android.annotation.NonNull; import android.content.Context; import android.net.wifi.SoftApCapability; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiManager; import android.util.Log; +import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java index 8cdb17ea5a6..42e5ef60cdf 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.accessibilityservice.AccessibilityServiceInfo; -import android.annotation.NonNull; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -40,6 +39,7 @@ import android.service.quicksettings.TileService; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.Flags; +import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index adf76f450b8..4d13bb63d19 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -36,7 +36,6 @@ import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application; -import android.annotation.NonNull; import android.app.Activity; import android.content.ComponentName; import android.content.Intent; @@ -52,6 +51,7 @@ import android.os.CancellationSignal; import android.view.View; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java index 5dfe8b99bef..8a10bd93e30 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java @@ -18,12 +18,12 @@ package com.android.settings.homepage.contextualcards; import static com.google.common.truth.Truth.assertThat; -import android.annotation.Nullable; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import androidx.annotation.Nullable; import androidx.slice.SliceProvider; import androidx.slice.widget.SliceLiveData; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java index 86631ffb2d4..9b510fb43e3 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java @@ -22,7 +22,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.robolectric.Shadows.shadowOf; -import android.annotation.Nullable; import android.app.Activity; import android.content.ComponentName; import android.content.Intent; @@ -30,6 +29,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.google.common.base.Strings; diff --git a/tests/robotests/src/com/android/settings/slices/SlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/slices/SlicePreferenceControllerTest.java index 56ea33c5592..c6978b1efe1 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicePreferenceControllerTest.java @@ -21,10 +21,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import android.annotation.NonNull; import android.content.Context; import android.net.Uri; +import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; import androidx.lifecycle.Observer; import androidx.slice.Slice; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java index 409c2612eca..dae17bc41e3 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java @@ -19,7 +19,8 @@ package com.android.settings.testutils.shadow; import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AuthenticatorDescription; -import android.annotation.NonNull; + +import androidx.annotation.NonNull; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationPackageManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationPackageManager.java index e6b0307b642..6408d46fc8d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationPackageManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationPackageManager.java @@ -16,11 +16,12 @@ package com.android.settings.testutils.shadow; -import android.annotation.NonNull; import android.app.ApplicationPackageManager; import android.content.pm.PackageInfo; import android.os.IRemoteCallback; +import androidx.annotation.NonNull; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java index 38e82189fd1..64a5f1169ef 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java @@ -17,13 +17,14 @@ package com.android.settings.testutils.shadow; import android.Manifest; -import android.annotation.NonNull; import android.content.Context; import android.content.pm.CrossProfileApps; import android.content.pm.ICrossProfileApps; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import androidx.annotation.NonNull; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java index 867a3063d4b..354352e8f90 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java @@ -21,8 +21,6 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED import static android.os.Build.VERSION_CODES.O; import static android.os.Build.VERSION_CODES.Q; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager.DeviceOwnerType; @@ -33,6 +31,8 @@ import android.app.admin.PasswordPolicy; import android.content.ComponentName; import android.content.Context; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.test.core.app.ApplicationProvider; import org.robolectric.annotation.Implementation; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java index fce049822eb..d45c2ca67d5 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java @@ -16,12 +16,13 @@ package com.android.settings.testutils.shadow; -import android.annotation.NonNull; import android.os.storage.DiskInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; +import androidx.annotation.NonNull; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; diff --git a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java index 0a5903313ac..0c2583ff239 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java @@ -18,8 +18,6 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.app.Application; import android.app.WallpaperColors; import android.app.WallpaperManager; @@ -27,6 +25,9 @@ import android.app.WallpaperManager.OnColorsChangedListener; import android.content.Context; import android.os.Handler; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.settings.FallbackHome; import org.junit.Before; @@ -43,10 +44,10 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import org.robolectric.shadows.ShadowApplication; @RunWith(RobolectricTestRunner.class) public class FallbackHomeActivityTest { diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index 5bacfab690b..14227ad09dd 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.annotation.Nullable; import android.content.Context; import android.net.wifi.WifiManager; import android.os.Bundle; @@ -20,6 +19,7 @@ import android.os.UserManager; import android.view.View; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivityTest.java b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivityTest.java index dccd0234f65..2c4bf9fe172 100644 --- a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivityTest.java @@ -22,12 +22,12 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.annotation.Nullable; import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; import android.os.UserManager; +import androidx.annotation.Nullable; import androidx.test.core.app.ApplicationProvider; import org.junit.Before; diff --git a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java index d0bb2bf24a2..0474f52117f 100644 --- a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java +++ b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java @@ -16,8 +16,6 @@ package com.android.settings.testutils.shadow; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.app.admin.DevicePolicyManager; import android.app.admin.PasswordMetrics; import android.content.ComponentName; @@ -25,6 +23,9 @@ import android.content.Context; import android.content.pm.UserInfo; import android.os.UserHandle; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockscreenCredential; diff --git a/tests/unit/src/com/android/settings/biometrics/GatekeeperPasswordProviderTest.java b/tests/unit/src/com/android/settings/biometrics/GatekeeperPasswordProviderTest.java index ab7a5afed18..40a01f828ef 100644 --- a/tests/unit/src/com/android/settings/biometrics/GatekeeperPasswordProviderTest.java +++ b/tests/unit/src/com/android/settings/biometrics/GatekeeperPasswordProviderTest.java @@ -29,9 +29,9 @@ import static org.mockito.Mockito.only; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.annotation.NonNull; import android.content.Intent; +import androidx.annotation.NonNull; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/unit/src/com/android/settings/wifi/RequestToggleWiFiActivityTest.java b/tests/unit/src/com/android/settings/wifi/RequestToggleWiFiActivityTest.java index 0e3dd4038e4..3d2d9a8f70d 100644 --- a/tests/unit/src/com/android/settings/wifi/RequestToggleWiFiActivityTest.java +++ b/tests/unit/src/com/android/settings/wifi/RequestToggleWiFiActivityTest.java @@ -21,13 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import android.annotation.Nullable; import android.app.IActivityManager; import android.content.Context; import android.content.Intent; import android.net.wifi.WifiManager; import android.os.RemoteException; +import androidx.annotation.Nullable; import androidx.test.core.app.ActivityScenario; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4;