diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java index 07ea73e57e5..c292dab57ee 100644 --- a/src/com/android/settings/SettingsDumpService.java +++ b/src/com/android/settings/SettingsDumpService.java @@ -30,7 +30,6 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.applications.ProcStatsData; import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; import com.android.settingslib.net.DataUsageController; @@ -43,6 +42,8 @@ import java.io.File; import java.io.FileDescriptor; import java.io.PrintWriter; +import androidx.annotation.VisibleForTesting; + public class SettingsDumpService extends Service { @VisibleForTesting static final String KEY_SERVICE = "service"; diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index e44b4606b32..904dea32a76 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -41,7 +41,6 @@ import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -63,6 +62,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index 4eb575408ad..8c76e715adb 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -26,12 +26,12 @@ import android.content.pm.ResolveInfo; import android.os.Bundle; import android.provider.Settings; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge.UsageState; import com.android.settings.overlay.FeatureFactory; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index 6c79a6ecfbb..94111cfe1a6 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -28,7 +28,6 @@ import android.provider.Settings; import android.view.Window; import android.view.WindowManager; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -38,6 +37,7 @@ import com.android.settings.applications.AppStateOverlayBridge.OverlayState; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.applications.ApplicationsState.AppEntry; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; @@ -49,7 +49,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc private static final String KEY_APP_OPS_SETTINGS_SWITCH = "app_ops_settings_switch"; private static final String LOG_TAG = "DrawOverlayDetails"; - private static final int [] APP_OPS_OP_CODE = { + private static final int[] APP_OPS_OP_CODE = { AppOpsManager.OP_SYSTEM_ALERT_WINDOW }; @@ -122,7 +122,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc logSpecialPermissionChange(newState, mPackageName); mAppOpsManager.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, mPackageInfo.applicationInfo.uid, mPackageName, newState - ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED); + ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED); } @VisibleForTesting @@ -175,6 +175,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc public static CharSequence getSummary(Context context, OverlayState overlayState) { return context.getString(overlayState.isPermissible() ? - R.string.app_permission_summary_allowed : R.string.app_permission_summary_not_allowed); + R.string.app_permission_summary_allowed + : R.string.app_permission_summary_not_allowed); } } diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java index 12ce08d5c00..d8ab6093fb8 100644 --- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java @@ -22,7 +22,6 @@ import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -34,6 +33,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java index 120a318c2c2..6af4f81b3f6 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java @@ -24,12 +24,12 @@ import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.overlay.FeatureFactory; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java index e380bb5d22f..a3997523768 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -32,7 +32,6 @@ import android.util.IconDrawableFactory; import android.util.Pair; import android.view.View; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; @@ -48,6 +47,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java index b768063a4d6..e5907ce9459 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -23,7 +23,6 @@ import android.os.Bundle; import android.provider.SearchIndexableResource; import android.view.View; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsUsageMonitor; import com.android.settings.R; @@ -44,6 +43,7 @@ import com.android.settingslib.widget.FooterPreference; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java index 82604e0a61d..6cf52eccebd 100644 --- a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java +++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java @@ -21,7 +21,6 @@ import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.vr.VrListenerService; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -33,6 +32,8 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + @SearchIndexable public class VrListenerSettings extends ManagedServiceSettings { private static final String TAG = VrListenerSettings.class.getSimpleName(); diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index 9ff3dc2e2d3..3c10e6d8196 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.util.Pair; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.EntityHeaderController; @@ -30,6 +29,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java index c1bcf5076f5..98a4b9c7a68 100644 --- a/src/com/android/settings/bluetooth/BluetoothEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java @@ -25,7 +25,6 @@ import android.os.UserManager; import android.provider.Settings; import android.widget.Toast; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.widget.SwitchWidgetController; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -34,6 +33,8 @@ import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import androidx.annotation.VisibleForTesting; + /** * BluetoothEnabler is a helper to manage the Bluetooth on/off checkbox * preference. It turns on/off Bluetooth and ensures the summary of the diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java index 18839dc965d..580a26f23c6 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java @@ -35,11 +35,12 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.annotation.VisibleForTesting; + /** * A dialogFragment used by {@link BluetoothPairingDialog} to create an appropriately styled dialog * for the bluetooth device. diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java index bbc90c4539b..c6658e199d8 100644 --- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.bluetooth; import android.content.Context; import android.view.View; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -34,6 +33,8 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.widget.FooterPreference; +import androidx.annotation.VisibleForTesting; + /** * PreferenceController to update of bluetooth state. All behavior except managing the footer text * is delegated to the SwitchWidgetController it uses. diff --git a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java index 1f3a689da66..32edb238a17 100644 --- a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java +++ b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java @@ -24,13 +24,14 @@ import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import androidx.annotation.VisibleForTesting; + /** Implements an AlertDialog for confirming that a user wishes to unpair or "forget" a paired * device*/ public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment { diff --git a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java index 4e5acefe616..44e3a91f20b 100644 --- a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java @@ -20,12 +20,13 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import androidx.annotation.VisibleForTesting; + /** Provides a dialog for changing the display name of a remote bluetooth device. */ public class RemoteDeviceNameDialogFragment extends BluetoothNameDialogFragment { public static final String TAG = "RemoteDeviceName"; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java index a37a78c02d3..471486b0918 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java @@ -20,7 +20,6 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Bundle; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -33,6 +32,8 @@ import com.google.android.collect.Lists; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Provides options for selecting the default USB mode. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java index fbcd5d19cd2..bd0cd8aeca2 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java @@ -19,11 +19,11 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.os.Handler; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; /** * This class provides common members and refresh functionality for usb controllers. diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 1fb2f723a6a..2e89e59ca24 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -34,7 +34,6 @@ import android.widget.EditText; import android.widget.NumberPicker; import android.widget.Spinner; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -47,6 +46,7 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index 09465f7f075..1658c46f880 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -21,12 +21,12 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.util.AttributeSet; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.net.DataUsageController; +import androidx.annotation.VisibleForTesting; import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index ee9798df712..87445604ebb 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -33,7 +33,6 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; @@ -44,6 +43,7 @@ import com.android.settingslib.utils.StringUtil; import java.util.Objects; import java.util.concurrent.TimeUnit; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java index 4a2307f28fe..d686d9875fb 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java @@ -19,7 +19,6 @@ import android.app.Application; import android.content.Context; import android.os.UserHandle; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateBaseBridge; @@ -39,6 +38,7 @@ import java.util.ArrayList; import java.util.Set; import java.util.TreeSet; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java index 253eed835f1..845e58a1e6a 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -20,11 +20,11 @@ import android.content.Context; import android.os.SystemProperties; import android.text.TextUtils; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java index 6a86cd93876..e85bbf9242c 100644 --- a/src/com/android/settings/display/ColorModePreferenceController.java +++ b/src/com/android/settings/display/ColorModePreferenceController.java @@ -20,11 +20,12 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import androidx.annotation.VisibleForTesting; + public class ColorModePreferenceController extends BasePreferenceController { private static final String TAG = "ColorModePreference"; diff --git a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java index a03e797da11..b7ebaf9bb8a 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java @@ -17,10 +17,11 @@ package com.android.settings.fuelgauge; import android.content.Context; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; import com.android.settingslib.utils.AsyncLoaderCompat; +import androidx.annotation.VisibleForTesting; + /** * Loader that can be used by classes to load BatteryInfo in a background thread. This loader will * automatically grab enhanced battery estimates if available or fall back to the system estimate diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index 021c108649a..84120d7e68b 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -29,7 +29,6 @@ import android.view.View; import android.widget.Checkable; import android.widget.TextView; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; @@ -38,6 +37,7 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; +import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; public class HighPowerDetail extends InstrumentedDialogFragment implements OnClickListener, diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java index c0568144760..68412c77390 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java @@ -23,7 +23,7 @@ import android.os.Bundle; import android.os.UserHandle; import android.util.IconDrawableFactory; -import com.android.internal.annotations.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index dd3d9dc94b0..4934bce700d 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -23,7 +23,6 @@ import android.os.Bundle; import android.os.UserHandle; import android.util.IconDrawableFactory; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -42,6 +41,7 @@ import com.android.settingslib.widget.FooterPreferenceMixinCompat; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java index bf2dd720b19..8a2d86dd31f 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java @@ -22,7 +22,6 @@ import android.icu.text.ListFormatter; import android.os.Parcel; import android.util.Pair; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -32,6 +31,8 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Tip to suggest user to restrict some bad apps */ diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java index 18ab3c2c054..9964f05d391 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java @@ -19,10 +19,11 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import androidx.annotation.VisibleForTesting; + /** * Tip to suggest user to remove app restriction. This is the empty tip and it is only used in * {@link com.android.settings.fuelgauge.AdvancedPowerUsageDetail} to create dialog. diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java index 21c10627c79..f8b86b06510 100644 --- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java +++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java @@ -22,10 +22,10 @@ import static android.provider.Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENA import android.content.Context; import android.provider.Settings; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java b/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java index 657f5b06d34..f8f1447c979 100644 --- a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java +++ b/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java @@ -31,7 +31,6 @@ import android.telephony.SubscriptionManager; import android.util.Log; import com.android.ims.ImsManager; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.slices.SettingsSliceProvider; @@ -46,6 +45,7 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import androidx.annotation.VisibleForTesting; import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java index d8fc0e4c4be..5d92279ca5a 100644 --- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java @@ -30,7 +30,6 @@ import android.provider.Settings; import android.service.notification.ScheduleCalendar; import android.service.notification.ZenModeConfig; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; @@ -40,6 +39,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java index bc605b8a07c..6af4d06ffb8 100644 --- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java +++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java @@ -22,12 +22,12 @@ import android.media.AudioManager; import android.os.UserHandle; import android.os.UserManager; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SliderPreferenceController; import com.android.settingslib.RestrictedPreference; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; /** diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index d21e3445e18..17739f9d3c5 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -27,7 +27,6 @@ import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.NotificationListenerService; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -40,6 +39,7 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; /** diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java index a2474fc2df6..83e427b6e65 100644 --- a/src/com/android/settings/notification/NotificationBackend.java +++ b/src/com/android/settings/notification/NotificationBackend.java @@ -38,7 +38,6 @@ import android.text.format.DateUtils; import android.util.IconDrawableFactory; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; import com.android.settingslib.R; import com.android.settingslib.Utils; import com.android.settingslib.utils.StringUtil; @@ -48,6 +47,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import androidx.annotation.VisibleForTesting; + public class NotificationBackend { private static final String TAG = "NotificationBackend"; diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java index 89c9871e8b5..71f02f150db 100644 --- a/src/com/android/settings/notification/SettingPrefController.java +++ b/src/com/android/settings/notification/SettingPrefController.java @@ -22,7 +22,6 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -31,6 +30,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index 62a0e2ef9e3..7df1dcf80e5 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import android.content.Context; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.notification.VolumeSeekBarPreference.Callback; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.annotation.VisibleForTesting; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java index a77237adc9e..44796f8e132 100644 --- a/src/com/android/settings/notification/WorkSoundPreferenceController.java +++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java @@ -32,7 +32,6 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; @@ -47,6 +46,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 1dbd295bdf1..4af81586b56 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -43,7 +43,6 @@ import android.util.ArraySet; import android.util.Log; import android.view.View; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -58,6 +57,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java index 0623b00b755..ced28cd126d 100644 --- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java @@ -21,10 +21,10 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java index ba4fa046832..1e2bdc22048 100644 --- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java @@ -5,10 +5,10 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java index 622f994271a..1813a57fc59 100644 --- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java @@ -28,13 +28,13 @@ import android.icu.text.ListFormatter; import android.provider.Contacts; import android.provider.ContactsContract; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index 4159a61e067..652db174179 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -25,12 +25,12 @@ import android.content.IntentSender; import android.os.Bundle; import android.os.UserManager; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.widget.LockPatternUtils; import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.setupwizardlib.util.WizardManagerHelper; +import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; public final class ChooseLockSettingsHelper { diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java index ecbaec7a961..94bc928761f 100644 --- a/src/com/android/settings/password/SetNewPasswordController.java +++ b/src/com/android/settings/password/SetNewPasswordController.java @@ -34,10 +34,11 @@ import android.os.Bundle; import android.os.IBinder; import android.os.UserManager; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.widget.LockPatternUtils; import com.android.settings.Utils; +import androidx.annotation.VisibleForTesting; + /** * Business logic for {@link SetNewPasswordActivity}. * diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java index 99b15302642..b8f35a6baa4 100644 --- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java +++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java @@ -28,7 +28,6 @@ import android.net.Uri.Builder; import android.provider.SettingsSlicesContract; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceDeepLinkSpringBoard; @@ -36,6 +35,7 @@ import com.android.settings.slices.SliceDeepLinkSpringBoard; import java.util.Collection; import java.util.concurrent.CountDownLatch; +import androidx.annotation.VisibleForTesting; import androidx.slice.Slice; import androidx.slice.SliceItem; import androidx.slice.SliceMetadata; diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java index bfe090e846e..7b98fe45a67 100644 --- a/src/com/android/settings/slices/SliceDataConverter.java +++ b/src/com/android/settings/slices/SliceDataConverter.java @@ -39,7 +39,6 @@ import android.util.Log; import android.util.Xml; import android.view.accessibility.AccessibilityManager; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySlicePreferenceController; @@ -62,6 +61,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import androidx.annotation.VisibleForTesting; + /** * Converts all Slice sources into {@link SliceData}. * This includes: diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index bdeb3f01c82..145e86fb4ba 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -36,7 +36,6 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.VpnConfig; import com.android.internal.util.ArrayUtils; @@ -49,6 +48,7 @@ import com.android.settingslib.RestrictedSwitchPreference; import java.util.List; +import androidx.annotation.VisibleForTesting; import androidx.fragment.app.DialogFragment; import androidx.preference.Preference; diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 4d7c8556231..00c4e49be3f 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -50,7 +50,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; @@ -71,6 +70,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java index 0489d6a8262..458b75c341c 100644 --- a/src/com/android/settings/widget/DonutView.java +++ b/src/com/android/settings/widget/DonutView.java @@ -36,13 +36,13 @@ import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; import android.view.View; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; import java.util.Locale; import androidx.annotation.ColorRes; +import androidx.annotation.VisibleForTesting; /** * DonutView represents a donut graph. It visualizes a certain percentage of fullness with a diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index b8cdf28b8d6..f9014b70664 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -33,7 +33,6 @@ import android.util.Log; import com.android.ims.ImsConfig; import com.android.ims.ImsManager; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.slices.SettingsSliceProvider; @@ -48,6 +47,7 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import androidx.annotation.VisibleForTesting; import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index d01b82f5115..d291f9cb5a8 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -44,7 +44,6 @@ import android.util.Log; import android.widget.ImageView; import android.widget.Toast; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -71,6 +70,7 @@ import java.net.UnknownHostException; import java.util.StringJoiner; import java.util.stream.Collectors; +import androidx.annotation.VisibleForTesting; import androidx.core.text.BidiFormatter; import androidx.fragment.app.Fragment; import androidx.preference.Preference; diff --git a/src/com/android/settings/wifi/tether/TetherService.java b/src/com/android/settings/wifi/tether/TetherService.java index e491de85ee0..3cfa7a1cba9 100644 --- a/src/com/android/settings/wifi/tether/TetherService.java +++ b/src/com/android/settings/wifi/tether/TetherService.java @@ -40,11 +40,11 @@ import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; - import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + public class TetherService extends Service { private static final String TAG = "TetherService"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);