diff --git a/src/com/android/settings/RemoteBugreportActivity.java b/src/com/android/settings/RemoteBugreportActivity.java index 20cc059daa5..1485287dba2 100644 --- a/src/com/android/settings/RemoteBugreportActivity.java +++ b/src/com/android/settings/RemoteBugreportActivity.java @@ -20,6 +20,7 @@ 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; @@ -28,7 +29,6 @@ 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 80f5962d92a..da15d035862 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -16,10 +16,12 @@ 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; @@ -41,7 +43,6 @@ 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 6c77273ad45..ca249e23c42 100644 --- a/src/com/android/settings/TouchBlockingFrameLayout.java +++ b/src/com/android/settings/TouchBlockingFrameLayout.java @@ -16,13 +16,12 @@ 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 93d5ebb00cf..9a739915bc0 100644 --- a/src/com/android/settings/TrustedCredentialsDialogBuilder.java +++ b/src/com/android/settings/TrustedCredentialsDialogBuilder.java @@ -15,6 +15,7 @@ */ package com.android.settings; +import android.annotation.NonNull; import android.app.Activity; import android.app.admin.DevicePolicyManager; import android.content.DialogInterface; @@ -30,7 +31,6 @@ 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 495065023e4..73f1d9e6c77 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -17,6 +17,7 @@ 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; @@ -42,7 +43,6 @@ 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 858b374db75..47c2a957d7b 100644 --- a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java +++ b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java @@ -21,7 +21,8 @@ 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; @@ -32,8 +33,6 @@ 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 103a2c10033..70d284da214 100644 --- a/src/com/android/settings/applications/AppLocaleUtil.java +++ b/src/com/android/settings/applications/AppLocaleUtil.java @@ -16,6 +16,7 @@ package com.android.settings.applications; +import android.annotation.NonNull; import android.app.LocaleConfig; import android.content.Context; import android.content.Intent; @@ -27,7 +28,6 @@ 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 bb628c96413..f3ad32655c6 100644 --- a/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java +++ b/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java @@ -16,15 +16,13 @@ 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 4ed9002d2e2..58f962ab716 100644 --- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -16,6 +16,7 @@ package com.android.settings.applications.appops; +import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.os.Bundle; import android.preference.PreferenceFrameLayout; @@ -23,7 +24,6 @@ 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 e7a391eb6d6..e85413896e5 100644 --- a/src/com/android/settings/applications/credentials/CombinedProviderInfo.java +++ b/src/com/android/settings/applications/credentials/CombinedProviderInfo.java @@ -16,6 +16,8 @@ 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; @@ -26,9 +28,6 @@ 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 e1862065e03..b0905bab077 100644 --- a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java +++ b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java @@ -18,6 +18,8 @@ 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; @@ -47,8 +49,6 @@ 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 2637d830481..a813ce4f5dd 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java @@ -16,6 +16,7 @@ package com.android.settings.applications.credentials; +import android.annotation.Nullable; import android.app.Activity; import android.app.settings.SettingsEnums; import android.content.Context; @@ -37,7 +38,6 @@ 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 567bc3141e9..47a89ec6497 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.applications.credentials; +import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -29,7 +30,6 @@ 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 c31fb9e547b..30c79734025 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java @@ -18,6 +18,7 @@ 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; @@ -27,7 +28,6 @@ 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 c43fbd5c40b..a6e3edf78e9 100644 --- a/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java +++ b/src/com/android/settings/applications/defaultapps/SettingIntentProvider.java @@ -16,10 +16,9 @@ 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 432b42384ab..8169072d868 100644 --- a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java +++ b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java @@ -17,6 +17,7 @@ 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; @@ -31,7 +32,6 @@ 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 f19b68a6cae..3c90bf358c0 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -17,6 +17,7 @@ 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; @@ -31,7 +32,6 @@ 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 4c9f813fc5e..c186e07a327 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -16,6 +16,7 @@ package com.android.settings.applications.specialaccess.premiumsms; +import android.annotation.Nullable; import android.app.Application; import android.app.settings.SettingsEnums; import android.content.Context; @@ -23,7 +24,6 @@ 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 73e1af1bc8a..40763e3934e 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java +++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java @@ -24,6 +24,7 @@ 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; @@ -44,7 +45,6 @@ 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 292d977a274..c9c8cff034c 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollBase.java +++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java @@ -18,6 +18,7 @@ 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; @@ -31,7 +32,6 @@ 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 78f60872186..369fa4b4311 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollSidecar.java +++ b/src/com/android/settings/biometrics/BiometricEnrollSidecar.java @@ -16,6 +16,7 @@ package com.android.settings.biometrics; +import android.annotation.Nullable; import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -23,8 +24,6 @@ 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 e4f25863a8b..7051b70ee92 100644 --- a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java @@ -16,12 +16,11 @@ 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 c7f73cb5b32..1b808383244 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -21,6 +21,8 @@ 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; @@ -58,8 +60,6 @@ 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 2916872e73f..99d4ff902f3 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java @@ -20,6 +20,7 @@ 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; @@ -28,8 +29,6 @@ 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 73eccdc4564..134462d10c1 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java @@ -16,14 +16,13 @@ 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 4dc75b9d375..11f3ee39062 100644 --- a/src/com/android/settings/biometrics/fingerprint/MessageDisplayController.java +++ b/src/com/android/settings/biometrics/fingerprint/MessageDisplayController.java @@ -16,12 +16,11 @@ 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 8d1113ee289..d3bc97764de 100644 --- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollHelper.java +++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollHelper.java @@ -16,6 +16,8 @@ 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; @@ -27,9 +29,6 @@ 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 d5b42118463..0cd36d0f471 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -16,8 +16,7 @@ package com.android.settings.bluetooth; -import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - +import android.annotation.Nullable; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.Context; @@ -25,10 +24,11 @@ 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 6dd1105569e..ebca34250e4 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; +import android.annotation.Nullable; import android.app.ActivityManager; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -25,8 +26,6 @@ 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 d670554a5c2..32ca2777392 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java +++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java @@ -18,6 +18,7 @@ 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; @@ -36,7 +37,6 @@ 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 2f56f77b078..f075048384c 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( - @NonNull BluetoothDevice device, + @android.annotation.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 1a2d52bebb2..b3d676cbfd8 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 b2e6fb20f72..0d3b1b12ff3 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java +++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java @@ -16,13 +16,12 @@ 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 56d0fa7b9e5..f47526f5fa6 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 1bc3c56533c..99ac12475bc 100644 --- a/src/com/android/settings/connecteddevice/dock/DockUpdater.java +++ b/src/com/android/settings/connecteddevice/dock/DockUpdater.java @@ -15,10 +15,9 @@ */ 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 5d30f7e2093..d1407aeeb61 100644 --- a/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java @@ -16,10 +16,9 @@ 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 d194499c88c..2f8b5c34696 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java +++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java @@ -22,6 +22,7 @@ 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; @@ -31,7 +32,6 @@ 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 5f9fc00b74e..151ed7b47f2 100644 --- a/src/com/android/settings/core/CategoryMixin.java +++ b/src/com/android/settings/core/CategoryMixin.java @@ -19,6 +19,7 @@ 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; @@ -29,7 +30,6 @@ 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 f37140eaaf6..6d450fe137f 100644 --- a/src/com/android/settings/core/PreferenceControllerListHelper.java +++ b/src/com/android/settings/core/PreferenceControllerListHelper.java @@ -20,14 +20,13 @@ 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 df3cd922752..acb1d34e291 100644 --- a/src/com/android/settings/core/PreferenceXmlParserUtils.java +++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java @@ -16,6 +16,7 @@ package com.android.settings.core; +import android.annotation.NonNull; import android.annotation.XmlRes; import android.content.Context; import android.content.res.TypedArray; @@ -27,7 +28,6 @@ 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 7fd392c8983..f165be7f58d 100644 --- a/src/com/android/settings/datausage/MeasurableLinearLayout.java +++ b/src/com/android/settings/datausage/MeasurableLinearLayout.java @@ -1,12 +1,11 @@ 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 febdead8ea0..c81ac550d97 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 ed638963258..8c731a46b13 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 ab65139b719..24257688d27 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 33badd1dec1..96842821521 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java @@ -14,11 +14,9 @@ * 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 b55c7cf3ed2..9b9eded98cf 100644 --- a/src/com/android/settings/development/tare/AlarmManagerFragment.java +++ b/src/com/android/settings/development/tare/AlarmManagerFragment.java @@ -15,6 +15,7 @@ */ package com.android.settings.development.tare; +import android.annotation.Nullable; import android.app.Fragment; import android.app.tare.EconomyManager; import android.content.res.Resources; @@ -25,8 +26,6 @@ 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 7f5e6638e55..e3b36a5dc02 100644 --- a/src/com/android/settings/development/tare/JobSchedulerFragment.java +++ b/src/com/android/settings/development/tare/JobSchedulerFragment.java @@ -15,6 +15,7 @@ */ package com.android.settings.development.tare; +import android.annotation.Nullable; import android.app.Fragment; import android.app.tare.EconomyManager; import android.content.res.Resources; @@ -25,8 +26,6 @@ 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 3407b7b85c1..b5dd6ea677c 100644 --- a/src/com/android/settings/development/tare/TareFactorController.java +++ b/src/com/android/settings/development/tare/TareFactorController.java @@ -25,6 +25,7 @@ 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; @@ -39,8 +40,6 @@ 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 269e2094b32..6d2f5ca3713 100644 --- a/src/com/android/settings/development/tare/TareFactorDialogFragment.java +++ b/src/com/android/settings/development/tare/TareFactorDialogFragment.java @@ -18,6 +18,7 @@ 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; @@ -32,8 +33,6 @@ 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 9c78d068f7c..79b7d41f9ec 100644 --- a/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java +++ b/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java @@ -18,6 +18,7 @@ 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; @@ -25,8 +26,6 @@ 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 bb9a78193ba..ba0cd33fa07 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -20,6 +20,7 @@ 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; @@ -37,7 +38,6 @@ 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 6ac0d267f02..a74c4260ac8 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -18,6 +18,7 @@ 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; @@ -53,7 +54,6 @@ 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 38b2c33828c..b419370e22b 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageEntry.java +++ b/src/com/android/settings/deviceinfo/storage/StorageEntry.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo.storage; +import android.annotation.NonNull; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; @@ -25,8 +26,6 @@ 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 a2ad25ff96d..622e665fe0f 100644 --- a/src/com/android/settings/display/ScreenResolutionFragment.java +++ b/src/com/android/settings/display/ScreenResolutionFragment.java @@ -16,6 +16,7 @@ package com.android.settings.display; +import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Resources; @@ -29,7 +30,6 @@ 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 9fc51ac0cdc..0f4634ea4c2 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -18,6 +18,7 @@ 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; @@ -32,7 +33,6 @@ 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 969bf63b802..a9aa6a4327c 100644 --- a/src/com/android/settings/fuelgauge/BatteryActiveView.java +++ b/src/com/android/settings/fuelgauge/BatteryActiveView.java @@ -14,6 +14,7 @@ package com.android.settings.fuelgauge; +import android.annotation.Nullable; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; @@ -21,8 +22,6 @@ 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 a041a31d444..ecd8a1b2093 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 31cec6a46ba..57dd5784a81 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 002c8075d03..e23e2190a18 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java @@ -16,6 +16,7 @@ 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; @@ -33,7 +34,6 @@ 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 b3a72d0bd37..2d09e6b029f 100644 --- a/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java +++ b/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java @@ -18,6 +18,8 @@ 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; @@ -28,9 +30,6 @@ 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 57e6d6f9904..f556018a085 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 509014cba2d..3e6659f0eb6 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 androidx.annotation.Nullable; +import android.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 16a2299c424..27a62a982bf 100644 --- a/src/com/android/settings/inputmethod/UserDictionarySettings.java +++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java @@ -16,6 +16,7 @@ package com.android.settings.inputmethod; +import android.annotation.Nullable; import android.app.ActionBar; import android.app.settings.SettingsEnums; import android.content.ContentResolver; @@ -38,7 +39,6 @@ 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 49675388b14..dce441be3dc 100644 --- a/src/com/android/settings/network/ActiveSubscriptionsListener.java +++ b/src/com/android/settings/network/ActiveSubscriptionsListener.java @@ -16,6 +16,7 @@ package com.android.settings.network; +import android.annotation.NonNull; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -29,7 +30,6 @@ 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 35b65c844f8..30374f57f85 100644 --- a/src/com/android/settings/network/CarrierConfigCache.java +++ b/src/com/android/settings/network/CarrierConfigCache.java @@ -20,6 +20,7 @@ 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; @@ -31,7 +32,6 @@ 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 11e9eddbdee..bc24f866c80 100644 --- a/src/com/android/settings/network/InternetUpdater.java +++ b/src/com/android/settings/network/InternetUpdater.java @@ -24,6 +24,7 @@ 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; @@ -36,7 +37,6 @@ 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 b0c85fcfdfc..af37d249c4c 100644 --- a/src/com/android/settings/network/MobileNetworkRepository.java +++ b/src/com/android/settings/network/MobileNetworkRepository.java @@ -18,6 +18,7 @@ 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; @@ -37,7 +38,6 @@ 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 7e276e889be..51fafb17ee8 100644 --- a/src/com/android/settings/network/ProxySubscriptionManager.java +++ b/src/com/android/settings/network/ProxySubscriptionManager.java @@ -20,6 +20,7 @@ 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; @@ -28,7 +29,6 @@ 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 ca498236fe0..e416760633c 100644 --- a/src/com/android/settings/network/SubscriptionUtil.java +++ b/src/com/android/settings/network/SubscriptionUtil.java @@ -22,6 +22,7 @@ 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; @@ -38,7 +39,6 @@ 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 c1a05f1c062..38f659603fe 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -31,6 +31,7 @@ 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; @@ -68,7 +69,6 @@ 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 377cb463460..bf7fcc03756 100644 --- a/src/com/android/settings/notification/AppBubbleListPreferenceController.java +++ b/src/com/android/settings/notification/AppBubbleListPreferenceController.java @@ -21,6 +21,7 @@ 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; @@ -30,7 +31,6 @@ 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 3f300c0fce3..9ea8c58024f 100644 --- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java +++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java @@ -24,6 +24,7 @@ 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; @@ -43,8 +44,6 @@ 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 6f16e56a43d..e2ef0ddccb4 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -19,6 +19,7 @@ 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; @@ -39,7 +40,6 @@ 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 3bbb059fb1d..f2c5cdde2ee 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 ef4bab97796..fb19d9d6b4c 100644 --- a/src/com/android/settings/notification/app/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/app/NotificationPreferenceController.java @@ -17,18 +17,21 @@ 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 5923a4e8dbf..224c31d1f55 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 418a5719b8a..aac695435ab 100644 --- a/src/com/android/settings/notification/zen/ZenAccessSettings.java +++ b/src/com/android/settings/notification/zen/ZenAccessSettings.java @@ -16,6 +16,7 @@ package com.android.settings.notification.zen; +import android.annotation.Nullable; import android.app.NotificationManager; import android.app.settings.SettingsEnums; import android.content.Context; @@ -29,7 +30,6 @@ 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 e74b7767faa..21fd94c554c 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -18,6 +18,8 @@ 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; @@ -31,8 +33,6 @@ 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 2af360a1215..ea00f7f4931 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java @@ -22,6 +22,7 @@ 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; @@ -47,7 +48,6 @@ 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 b9b1810da25..b139ae9a9f2 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/src/com/android/settings/password/ConfirmLockPassword.java @@ -26,6 +26,7 @@ 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; @@ -56,7 +57,6 @@ 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 3415478c912..6e3ad30a2f9 100644 --- a/src/com/android/settings/password/ConfirmLockPattern.java +++ b/src/com/android/settings/password/ConfirmLockPattern.java @@ -24,6 +24,7 @@ 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; @@ -45,8 +46,6 @@ 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 7cf6a00ea62..0d8f02e8e52 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 a54df94fa90..4bdc3240322 100644 --- a/src/com/android/settings/password/PasswordUtils.java +++ b/src/com/android/settings/password/PasswordUtils.java @@ -18,6 +18,7 @@ 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; @@ -32,8 +33,6 @@ 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 aa8fe5168bc..ef8a15a1ac7 100644 --- a/src/com/android/settings/password/SetNewPasswordController.java +++ b/src/com/android/settings/password/SetNewPasswordController.java @@ -22,6 +22,7 @@ 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; @@ -33,7 +34,6 @@ 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 5956d896362..e94c589d4bb 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 c3830c19d82..5377f15484e 100644 --- a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java +++ b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java @@ -16,12 +16,11 @@ 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 c8a54712067..fcb2347f5b0 100644 --- a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java +++ b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.privacy; +import android.annotation.NonNull; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -25,7 +26,6 @@ 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 b68b5ec7d0e..0de4f06c89c 100644 --- a/src/com/android/settings/privacy/PrivacyHubPreferenceController.java +++ b/src/com/android/settings/privacy/PrivacyHubPreferenceController.java @@ -16,11 +16,10 @@ 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 8014104e983..b5532394aa2 100644 --- a/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java +++ b/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java @@ -16,10 +16,9 @@ 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 0741ce4b02c..9262ba8cb7f 100644 --- a/src/com/android/settings/search/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -18,6 +18,7 @@ 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; @@ -29,7 +30,6 @@ 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 74494210d35..453832ddc07 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -16,6 +16,7 @@ package com.android.settings.search.actionbar; +import android.annotation.NonNull; import android.app.Activity; import android.app.settings.SettingsEnums; import android.content.Intent; @@ -25,7 +26,6 @@ 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 3335fe61d60..7775f836013 100644 --- a/src/com/android/settings/security/InstallCaCertificateWarning.java +++ b/src/com/android/settings/security/InstallCaCertificateWarning.java @@ -18,6 +18,7 @@ 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; @@ -25,8 +26,6 @@ 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 2c1b45219d0..6a1d40aef7a 100644 --- a/src/com/android/settings/security/RequestManageCredentials.java +++ b/src/com/android/settings/security/RequestManageCredentials.java @@ -18,6 +18,7 @@ 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; @@ -46,7 +47,6 @@ 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 1cf00de3e6d..5145f1809e5 100644 --- a/src/com/android/settings/slices/SliceBackgroundWorker.java +++ b/src/com/android/settings/slices/SliceBackgroundWorker.java @@ -17,6 +17,7 @@ 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; @@ -28,7 +29,6 @@ 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 b785210f973..b570b2dff97 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -20,6 +20,7 @@ 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; @@ -37,7 +38,6 @@ 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 c85789dbed8..47be7fe9bd3 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -18,6 +18,7 @@ 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; @@ -26,7 +27,6 @@ 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 7e1f460e158..498cc3ed529 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 2445e87f3e9..b01749f0c5e 100644 --- a/src/com/android/settings/utils/ContentCaptureUtils.java +++ b/src/com/android/settings/utils/ContentCaptureUtils.java @@ -16,6 +16,8 @@ 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; @@ -25,9 +27,6 @@ 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 5950d5d0ce6..9ef0fe256fd 100644 --- a/src/com/android/settings/utils/FileSizeFormatter.java +++ b/src/com/android/settings/utils/FileSizeFormatter.java @@ -16,6 +16,8 @@ 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; @@ -26,9 +28,6 @@ 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 d5f00408fd5..4ee229eb721 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -18,6 +18,7 @@ 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; @@ -33,7 +34,6 @@ 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 00c8f5994ce..1d5b3cc6d51 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -18,6 +18,7 @@ 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; @@ -34,7 +35,6 @@ 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 be938a6529f..f225470564f 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 androidx.annotation.NonNull; +import android.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 64f27aa822c..a267de04a5b 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 ddd13701757..a6e5c60ce8e 100644 --- a/src/com/android/settings/widget/EmptyTextSettings.java +++ b/src/com/android/settings/widget/EmptyTextSettings.java @@ -16,6 +16,7 @@ package com.android.settings.widget; +import android.annotation.Nullable; import android.os.Bundle; import android.util.TypedValue; import android.view.Gravity; @@ -24,8 +25,6 @@ import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.TextView; -import androidx.annotation.Nullable; - import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java b/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java index 3fee01ffdbe..271378a3c47 100644 --- a/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java +++ b/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java @@ -17,6 +17,8 @@ package com.android.settings.widget; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; @@ -28,9 +30,6 @@ import android.view.ViewDebug; import android.view.ViewGroup; import android.view.ViewHierarchyEncoder; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import com.android.internal.R; import java.lang.annotation.Retention; diff --git a/src/com/android/settings/widget/TintDrawable.java b/src/com/android/settings/widget/TintDrawable.java index 7b348905217..13eb1211da7 100644 --- a/src/com/android/settings/widget/TintDrawable.java +++ b/src/com/android/settings/widget/TintDrawable.java @@ -16,16 +16,15 @@ package com.android.settings.widget; - +import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.res.ColorStateList; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.content.res.TypedArray; import android.graphics.drawable.DrawableWrapper; import android.util.AttributeSet; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.util.Log; import com.android.settings.R; diff --git a/src/com/android/settings/widget/UsageGraph.java b/src/com/android/settings/widget/UsageGraph.java index c92ea1bdf1b..78dcd7a5a14 100644 --- a/src/com/android/settings/widget/UsageGraph.java +++ b/src/com/android/settings/widget/UsageGraph.java @@ -16,6 +16,7 @@ package com.android.settings.widget; +import android.annotation.Nullable; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; @@ -34,7 +35,6 @@ import android.util.SparseIntArray; import android.util.TypedValue; import android.view.View; -import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 2b3bedbe55f..33f2827d7f8 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -15,6 +15,7 @@ */ package com.android.settings.wifi; +import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; @@ -27,7 +28,6 @@ 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 e5290f41fea..e1add1585a9 100644 --- a/src/com/android/settings/wifi/WifiEntryPreference.java +++ b/src/com/android/settings/wifi/WifiEntryPreference.java @@ -17,6 +17,7 @@ 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; @@ -30,7 +31,6 @@ 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 210e94cb13b..215c6b05848 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java @@ -16,6 +16,7 @@ package com.android.settings.wifi.dpp; +import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Intent; @@ -39,8 +40,6 @@ 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 5ab899afdc5..9e7365ee309 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 0be3bc00c31..2935ed49e74 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 0baac2c063a..908ccdcc845 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 6f59411cd31..41b6dd939bf 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 42e5ef60cdf..8cdb17ea5a6 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java @@ -24,6 +24,7 @@ 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; @@ -39,7 +40,6 @@ 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 4d13bb63d19..adf76f450b8 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -36,6 +36,7 @@ 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; @@ -51,7 +52,6 @@ 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 8a10bd93e30..5dfe8b99bef 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 9b510fb43e3..86631ffb2d4 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java @@ -22,6 +22,7 @@ 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; @@ -29,8 +30,6 @@ 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 c6978b1efe1..56ea33c5592 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 dae17bc41e3..409c2612eca 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java @@ -19,8 +19,7 @@ package com.android.settings.testutils.shadow; import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AuthenticatorDescription; - -import androidx.annotation.NonNull; +import android.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 6408d46fc8d..e6b0307b642 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationPackageManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationPackageManager.java @@ -16,12 +16,11 @@ 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 64a5f1169ef..38e82189fd1 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java @@ -17,14 +17,13 @@ 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 354352e8f90..867a3063d4b 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java @@ -21,6 +21,8 @@ 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; @@ -31,8 +33,6 @@ 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 d45c2ca67d5..fce049822eb 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java @@ -16,13 +16,12 @@ 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 0c2583ff239..0a5903313ac 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java @@ -18,6 +18,8 @@ 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; @@ -25,9 +27,6 @@ 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; @@ -44,10 +43,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 14227ad09dd..5bacfab690b 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -12,6 +12,7 @@ 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; @@ -19,7 +20,6 @@ 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 2c4bf9fe172..dccd0234f65 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 0474f52117f..d0bb2bf24a2 100644 --- a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java +++ b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java @@ -16,6 +16,8 @@ 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; @@ -23,9 +25,6 @@ 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 40a01f828ef..ab7a5afed18 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 3d2d9a8f70d..0e3dd4038e4 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;