diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index 382c4c86..ced67a2d 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -1,20 +1,17 @@
+
+ xmlns:tools="http://schemas.android.com/tools"
+ coreApp="true"
+ package="com.cariad.cea.settings"
+ android:sharedUserId="android.uid.system">
-
-
-
+
-
-
+ android:protectionLevel="signature|privileged" />
+ android:protectionLevel="signature|privileged" />
@@ -41,7 +38,9 @@
-
+
@@ -51,7 +50,7 @@
-
+
@@ -59,14 +58,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -102,18 +101,18 @@
-
+
-
-
-
+
+
+
-
+
-
+
@@ -145,148 +144,169 @@
+ android:name="com.android.settings.SettingsApplication"
+ android:appComponentFactory="androidx.core.app.CoreComponentFactory"
+ android:backupAgent="com.android.settings.backup.SettingsBackupHelper"
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true"
+ android:enableOnBackInvokedCallback="true"
+ android:gwpAsanMode="always"
+ android:hardwareAccelerated="true"
+ android:icon="@drawable/ic_launcher_settings"
+ android:label="@string/settings_label"
+ android:requiredForAllUsers="true"
+ android:supportsRtl="true"
+ android:theme="@style/Theme.Settings"
+ android:usesCleartextTraffic="true">
+
-
-
-
+ android:value="true" />
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
-
+
+ android:icon="@drawable/ic_homepage_network"
+ android:label="@string/network_dashboard_title">
+
+
-
-
-
+
+
-
-
+ android:exported="true"
+ android:label="@string/network_settings_title"
+ android:launchMode="singleTop">
+
+
+
@@ -294,2097 +314,2461 @@
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+ android:icon="@drawable/ic_homepage_connected_device"
+ android:label="@string/connected_devices_dashboard_title">
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
+ android:label="@string/memtag_title">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:label="@string/wifi_settings">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:icon="@drawable/ic_homepage_network"
+ android:label="@string/provider_internet_settings">
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+ android:icon="@drawable/ic_homepage_network"
+ android:label="@string/wifi_details_title"
+ android:permission="android.permission.CHANGE_WIFI_STATE">
+
+
+
-
-
+
-
+ android:name="com.android.settings.wifi.WifiPickerActivity"
+ android:exported="true"
+ android:permission="android.permission.CHANGE_WIFI_STATE">
+
-
-
-
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+ android:icon="@drawable/ic_settings_wireless"
+ android:label="@string/wifi_configure_settings_preference_title">
+
+
-
-
-
+
-
+ android:icon="@drawable/ic_settings_wireless"
+ android:label="@string/wifi_saved_access_points_label">
+
-
-
-
+
-
-
-
+
+
-
-
-
-
+
+
+
-
+
+
-
-
-
+
+
-
-
-
-
+
+
+
-
+
+
+
-
-
+ is clicked, this activity will be launched anyway.
+ -->
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:label="@string/devices_title"
+ android:targetActivity="com.android.settings.Settings$BluetoothSettingsActivity">
+
+
+
+
+
+
-
-
+
-
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
+
+
+
-
-
+
-
+
-
-
-
-
-
-
-
-
-
+ android:theme="@style/Theme.Material3.DayNight.BottomSheetDialog" />
+
+
+
+ android:icon="@drawable/ic_homepage_network"
+ android:label="@string/tether_settings_title_all">
+
-
-
-
+
+
+
+
+
+
+ android:icon="@drawable/ic_homepage_wifi_tethering"
+ android:label="@string/wifi_hotspot_checkbox_text">
+
+
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+ android:icon="@drawable/ic_homepage_vpn"
+ android:label="@string/vpn_settings_title">
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:icon="@drawable/ic_settings_date_time"
+ android:label="@string/date_and_time">
+
+
-
-
-
+
-
+ android:icon="@drawable/ic_settings_language"
+ android:label="@string/language_picker_title">
+
+
-
-
-
+
-
-
-
-
+
+ android:exported="true"
+ android:label="@string/app_locale_picker_title">
+
+
-
-
-
-
+ android:theme="@android:style/Theme.NoDisplay">
+ android:icon="@drawable/ic_settings_language"
+ android:label="@string/language_settings">
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:icon="@drawable/ic_settings_languages"
+ android:label="@string/languages_settings">
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
+
-
-
-
-
-
-
-
+ android:label="@string/keyboard_layout_picker_title">
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
+
+
-
+
+
-
-
-
-
+
+
+
+
+
-
+ android:label="@string/zen_mode_settings_title">
+
+
+
-
-
-
+
-
+
+
-
-
-
+
+
+
-
+ android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
+ android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">
+
+ android:label="@string/zen_mode_automation_settings_title">
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
-
+ android:icon="@drawable/ic_homepage_display"
+ android:label="@string/display_settings">
+
+
-
-
-
+
-
+ android:label="@string/accelerometer_title">
+
+
-
-
-
+
+
+
+ android:icon="@drawable/ic_homepage_night_display"
+ android:label="@string/night_display_title">
+
+
-
-
-
+
-
+ android:name="com.android.settings.Settings$DarkThemeSettingsActivity"
+ android:enabled="true"
+ android:exported="true"
+ android:label="@string/dark_ui_mode">
+
+
-
-
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
+
-
+
+
-
+
+
-
+ android:permission="android.permission.MODIFY_PHONE_STATE"
+ android:theme="@android:style/Theme.NoDisplay">
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ InstalledAppDetails.
+ -->
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
-
-
+
+
-
+ android:icon="@drawable/ic_homepage_location"
+ android:label="@string/location_settings_title">
+
+
-
-
-
+
+ android:icon="@drawable/ic_homepage_location"
+ android:label="@string/location_services_screen_title">
+
-
-
-
+
-
+ android:icon="@drawable/ic_homepage_location"
+ android:label="@string/location_scanning_wifi_always_scanning_title"
+ android:permission="android.permission.CHANGE_WIFI_STATE">
+
-
-
-
-
+
+
+
+
+ android:icon="@drawable/ic_homepage_security"
+ android:label="@string/security_settings_title">
+
+
+
+
-
-
-
+
-
+ android:icon="@drawable/ic_settings_security"
+ android:label="@string/security_advanced_settings">
+
-
-
-
+
+
+
+ android:name="com.android.settings.Settings$MoreSecurityPrivacySettingsActivity"
+ android:exported="true"
+ android:label="@string/more_security_privacy_settings">
+
+
-
-
-
-
+
+
+
+
+
-
+ android:icon="@drawable/ic_settings_security"
+ android:label="@string/trusted_credentials">
+
-
-
-
+
-
-
+
+
-
-
-
+
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
-
-
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
-
+ android:value="com.android.settings.applications.UsageAccessDetails" />
+
-
-
+
+
-
-
-
+
+
+
+ android:icon="@drawable/ic_homepage_accessibility"
+ android:label="@string/accessibility_settings">
+
+
-
-
-
+
-
+
-
-
-
+
-
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+ android:targetActivity="com.android.settings.accessibility.AccessibilitySettingsForSetupWizardActivity">
-
+
@@ -2398,164 +2782,220 @@
android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupWizard" />
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
+
-
-
-
+
-
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
-
+
-
-
-
+
-
+
-
-
-
+
-
+
-
-
-
+
-
+
-
-
-
-
-
+
+
+
@@ -2564,825 +3004,986 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ android:theme="@style/SudThemeGlif.DayNight">
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
-
-
+
-
-
-
-
-
+
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
+ android:targetActivity="com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity">
+
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
-
-
+
+ android:label="@string/lock_settings_picker_title"
+ android:theme="@style/GlifTheme.Light">
+
-
-
-
-
-
-
+
+ android:theme="@android:style/Theme.NoDisplay">
+
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
-
-
-
+
-
-
-
-
+
-
-
-
-
-
-
-
+ android:windowSoftInputMode="stateVisible|adjustResize" />
+ android:icon="@drawable/ic_homepage_storage"
+ android:label="@string/storage_settings">
+
+
-
-
-
+
-
+
+
+ android:mimeType="vnd.android.document/root"
+ android:scheme="content" />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:label="@string/apn_edit">
+
+
-
+
+
-
-
-
+
+
+
+ android:label="@string/development_settings_title">
-
+
+
-
-
-
-
+
+
+
+
+ android:icon="@drawable/ic_settings_print"
+ android:label="@string/print_settings">
+
+
-
-
-
-
+
+
+
+
+
-
+
+
-
-
+
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ android:targetActivity="com.android.settings.Settings$WebViewAppPickerActivity"
+ android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
-
-
+
-
+
+
-
-
+
+
-
+ android:icon="@drawable/ic_cast_24dp"
+ android:label="@string/wifi_display_settings_title">
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
-
-
+
+
+
+
+
-
-
+
+
-
+ android:label="@string/power_usage_summary_title">
+
+
-
-
+
-
+ android:permission="com.android.settings.BATTERY_DATA" />
-
-
-
-
-
-
-
-
-
+ android:name="com.android.settings.fuelgauge.batteryusage.bugreport.BugReportContentProvider"
+ android:authorities="${applicationId}.battery.usage.bugreport"
+ android:exported="false" />
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
-
-
+
+ android:icon="@drawable/ic_homepage_battery"
+ android:label="@string/battery_saver">
+
-
-
-
+
-
-
+
+
-
+
-
-
-
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+ android:exported="true"
+ android:icon="@drawable/ic_homepage_data_usage"
+ android:label="@string/data_usage_summary_title">
+
+
-
-
+
+
-
-
-
+
+
+
+ android:icon="@drawable/ic_settings_display"
+ android:label="@string/screensaver_settings_title">
+
-
-
-
+
-
+ android:icon="@drawable/ia_settings_communal"
+ android:label="@string/communal_settings_title">
+
-
-
-
-
+
+
+
+
+ android:icon="@drawable/ic_settings_multiuser"
+ android:label="@string/user_settings_title">
+
-
-
-
-
+
+
+
+
+ android:icon="@drawable/ic_settings_nfc_payment"
+ android:label="@string/nfc_payment_settings_title">
+
+
-
-
-
+
-
-
+
+
-
-
-
-
-
+
+
-
-
-
+
+
+
+ android:label="@string/manage_notification_access_title">
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+ android:label="@string/manage_zen_access_title">
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+ android:name="com.android.settings.Settings$ConfigureNotificationSettingsActivity"
+ android:exported="true"
+ android:label="@string/configure_notification_settings">
+
+
-
-
-
+
-
+ android:name="com.android.settings.Settings$ConversationListSettingsActivity"
+ android:exported="true"
+ android:label="@string/zen_mode_conversations_title">
+
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+ android:name="com.android.settings.Settings$PremiumSmsAccessActivity"
+ android:exported="true"
+ android:label="@string/premium_sms_access">
+
+
-
-
-
+
+
+
+ android:label="@string/sound_settings">
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+ android:label="@string/manual">
+
-
-
-
+
+
+ android:label="@string/regulatory_labels"
+ android:theme="@style/Theme.AlertDialog">
+
-
-
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+ android:exported="false"
+ android:grantUriPermissions="true">
-
-
+ android:exported="false"
+ android:grantUriPermissions="true" />
+ android:exported="true"
+ android:permission="android.permission.CALL_PRIVILEGED" />
+ android:permission="android.permission.CHANGE_WIFI_STATE"
+ android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+
-
+ android:theme="@style/Transparent">
+
-
+ android:excludeFromRecents="true"
+ android:exported="true"
+ android:launchMode="singleTop"
+ android:permission="android.permission.NETWORK_SETTINGS"
+ android:taskAffinity=".wifi.NetworkRequestDialogActivity"
+ android:theme="@style/Theme.AlertDialog">
+
+ android:theme="@style/Theme.AlertDialog.SimConfirmDialog">
-
-
+ android:label="@string/power_flashlight"
+ android:theme="@android:style/Theme.NoDisplay" />
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
-
-
+ android:multiprocess="false"
+ android:permission="android.permission.READ_SEARCH_INDEXABLES">
-
@@ -4105,285 +4829,288 @@
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -4392,689 +5119,922 @@
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+ android:icon="@drawable/ic_homepage_apps"
+ android:label="@string/apps_dashboard_title">
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+ android:icon="@drawable/ic_homepage_system_dashboard"
+ android:label="@string/header_category_system">
+
-
-
-
-
+
+
+
+
+
-
-
+ android:permission="android.permission.DUMP" />
+ android:label="@string/debug_layout"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-
+
+
+ android:label="@string/track_frame_time"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-
+
+
+ android:label="@string/force_rtl_layout_all_locales"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-
+
+
+ android:label="@string/window_animation_scale_title"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-
-
+
+
+ android:label="@string/sensors_off_quick_settings_title"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-
-
+
+
+ android:label="@string/enable_adb_wireless"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-
-
+
+
+ android:icon="@drawable/tile_icon_show_taps"
+ android:label="@string/show_touches"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-
+
+
-
-
-
-
-
+ android:exported="true"
+ android:permission="android.permission.DUMP"
+ android:theme="@style/Transparent" />
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+ android:theme="@style/Theme.AlertDialog.SimConfirmDialog">
+
-
-
-
+ android:label="@string/bluetooth_find_broadcast_title"
+ android:permission="android.permission.BLUETOOTH_CONNECT">
+
-
-
-
+ android:icon="@drawable/ic_homepage_connected_device"
+ android:label="@string/connected_device_saved_title"
+ android:permission="android.permission.BLUETOOTH_CONNECT">
+
-
-
+
-
+ android:name="com.android.settings.Settings$StylusUsiDetailsActivity"
+ android:exported="true"
+ android:label="@string/stylus_device_details_title">
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:excludeFromRecents="true"
+ android:exported="true"
+ android:label="@string/settings_panel_title"
+ android:launchMode="singleInstance"
+ android:theme="@style/Theme.Panel">
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+ android:name="com.android.settings.slices.SliceRelayReceiver"
+ android:exported="true"
+ android:permission="android.permission.MANAGE_SLICE_PERMISSIONS" />
+ android:name="com.android.settings.slices.VolumeSliceRelayReceiver"
+ android:exported="true"
+ android:permission="android.permission.MANAGE_SLICE_PERMISSIONS" />
-
+ android:exported="true"
+ android:permission="android.permission.WRITE_SETTINGS_HOMEPAGE_DATA">
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+ android:label="@string/gesture_settings_activity_title">
+
+
-
-
-
-
+
+
+
+
+ android:label="@string/button_navigation_settings_activity_title">
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+
-
+
-
-
+
-
+
+ android:exported="false"
+ android:launchMode="singleInstance"
+ android:theme="@style/GlifV3Theme.DayNight.NoActionBar" />
+
+
+
+
-
-
-
-
-
-
-
-
-
+ android:launchMode="singleTask">
+
-
-
+
+
+
-
-
-
-
+
+
-
+
+ android:label="@string/one_handed_title">
+
+
-
-
+
+
+
-
+
-
-
+
+
+ android:exported="true"
+ android:permission="android.permission.BLUETOOTH_CONNECT">
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
@@ -5084,42 +6044,26 @@
-
+ android:name="com.android.settings.privatespace.PrivateSpaceSetupActivity"
+ android:exported="false"
+ android:theme="@style/GlifV3Theme.Light" />
+ android:name="com.android.settings.privatespace.PrivateSpaceAuthenticationActivity"
+ android:exported="true"
+ android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+ android:permission="android.permission.NETWORK_SETTINGS"
+ android:theme="@style/Theme.Material3.DayNight.Dialog">
-
+
+
\ No newline at end of file
diff --git a/Settings/build.gradle b/Settings/build.gradle
index 010ad8bb..3139b7fd 100644
--- a/Settings/build.gradle
+++ b/Settings/build.gradle
@@ -30,7 +30,7 @@ plugins {
//}
android {
- namespace 'com.android.settings'
+ namespace 'com.cariad.cea.settings'
compileSdk 34
defaultConfig {
@@ -108,6 +108,8 @@ android {
}
dependencies {
+ implementation libs.androidx.activity
+ implementation libs.androidx.constraintlayout
compileOnly files('../libs/framework.jar')
implementation libs.navigation.fragment.ktx
implementation libs.window.window.java
diff --git a/Settings/res/layout/activity_my_main.xml b/Settings/res/layout/activity_my_main.xml
new file mode 100644
index 00000000..246b62e8
--- /dev/null
+++ b/Settings/res/layout/activity_my_main.xml
@@ -0,0 +1,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Settings/res/values/strings.xml b/Settings/res/values/strings.xml
index 3e2481c7..c669fffe 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -1,5 +1,4 @@
-
-
-
+
"Yes"
@@ -50,7 +47,8 @@
Only the admin users can access developer settings.
-
+
+
System
@@ -294,7 +292,7 @@
Tail button press
- %s (Work profile)
+ %s (Work profile)
Write in text fields
@@ -595,15 +593,15 @@
Select UTC offset
- %1$s (%2$s)
+ %1$s (%2$s)
- %2$s (%1$s)
+ %2$s (%1$s)
- Uses %1$s. %2$s
+ Uses %1$s. %2$s
- %1$s starts on %2$s.
+ %1$s starts on %2$s.
- Uses %1$s. No daylight savings time.
+ Uses %1$s. No daylight savings time.
Daylight savings time
@@ -613,7 +611,8 @@
Select by UTC offset
-
+
+
Lock after screen timeout
@@ -688,7 +687,8 @@
App security, device lock, permissions
-
+
+
Face added
@@ -814,7 +814,8 @@
Use Face Unlock to unlock your phone
-
+
+
Fingerprint
@@ -878,9 +879,10 @@
-
+
+
- Watch Unlock
+ Watch Unlock
When you set up Face Unlock and Fingerprint Unlock, your phone will ask for your fingerprint when you wear a mask or are in a dark area.\n\nWatch Unlock is another convenient way to unlock your phone, for example, when your fingers are wet or face isn\u2019t recognized.
@@ -914,19 +916,20 @@
Set up
- Fingerprint and %s added
+ Fingerprint and %s added
- Fingerprints and %s added
+ Fingerprints and %s added
- Face and %s added
+ Face and %s added
- Face, fingerprint, and %s added
+ Face, fingerprint, and %s added
- Face, fingerprints, and %s added
+ Face, fingerprints, and %s added
-
+
+
- Remote Authenticator Unlock
+ Remote Authenticator Unlock
Watch added
@@ -984,7 +987,8 @@
Remove watch
-
+
+
Fingerprint & Face Unlock
@@ -1097,11 +1101,11 @@
This helps capture more of your fingerprint
- Enrolling fingerprint %d percent
+ Enrolling fingerprint %d percent
- Enrolled %d percent
+ Enrolled %d percent
- Enrolling fingerprint %d percent
+ Enrolling fingerprint %d percent
Fingerprint added
@@ -1123,7 +1127,7 @@
You\u2019ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you\u2019ll need to set this up later. Setup takes only a minute or so.
- Skip setup for %s?
+ Skip setup for %s?
Skip PIN setup?
@@ -1383,14 +1387,14 @@
Got it
- You can add up to %d fingerprints
+ You can add up to %d fingerprints
You\u2019ve added the maximum number of fingerprints
Can\u2019t add more fingerprints
- Delete \'%1$s\'
+ Delete \'%1$s\'
You won\'t be able to use your fingerprint to unlock your work profile, authorize purchases, or sign in to work apps.
@@ -1410,9 +1414,11 @@
For added security, set a PIN, pattern, or password for this device.
-
+
+
-
+
+
Secure your phone
@@ -1468,11 +1474,13 @@
Enter device PIN to disable auto-confirm
-
+
+
Screen lock
-
+
+
Work profile lock
@@ -1579,13 +1587,13 @@
Delete
- %1$s recommends a strong PIN or password and may not work as expected without one
+ %1$s recommends a strong PIN or password and may not work as expected without one
- %1$s recommends a new PIN or password and may not work as expected without one
+ %1$s recommends a new PIN or password and may not work as expected without one
- %1$s recommends a new pattern, PIN, or password and may not work as expected without one
+ %1$s recommends a new pattern, PIN, or password and may not work as expected without one
- %1$s recommends a new screen lock
+ %1$s recommends a new screen lock
@@ -1835,14 +1843,14 @@
Disconnect App?
- %1$s app will no longer connect to your %2$s
+ %1$s app will no longer connect to your %2$s
Experimental. Improves audio quality.
Forget device
- Disconnect app
+ Disconnect app
Maximum connected Bluetooth audio devices
@@ -1924,19 +1932,19 @@
Open site
- %1$s left
+ %1$s left
- Expires on %1$s
+ Expires on %1$s
- %1$d Mbps
+ %1$d Mbps
- %1$d Mbps
+ %1$d Mbps
- %1$d Mbps
+ %1$d Mbps
- %s wants to turn on Wi-Fi
+ %s wants to turn on Wi-Fi
- %s wants to turn off Wi-Fi
+ %s wants to turn off Wi-Fi
Verify bytecode of debuggable apps
@@ -1971,7 +1979,8 @@
When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam web pages, YouTube videos, contacts, and more.\n\nJust bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed.
-
+
+
Wi\u2011Fi
@@ -2067,7 +2076,8 @@
You\u0027re connected to a WEP network. If you block these networks, you\u0027ll be disconnected.
-
+
+
Advanced options
@@ -2149,19 +2159,19 @@
Add a device
- Center the QR code below to add the device to \u201c%1$s\u201d
+ Center the QR code below to add the device to \u201c%1$s\u201d
Scan QR code
- Center the QR code below to connect to \u201c%1$s\u201d
+ Center the QR code below to connect to \u201c%1$s\u201d
Join Wi\u2011Fi by scanning a QR code
Share Wi\u2011Fi
- Scan this QR code with another device to join \u201c%1$s\u201d
+ Scan this QR code with another device to join \u201c%1$s\u201d
- Scan this QR code to connect to \u201c%1$s\u201d
+ Scan this QR code to connect to \u201c%1$s\u201d
Try again. If the issue continues, contact the device manufacturer
@@ -2171,7 +2181,7 @@
Make sure the device has been plugged in, charged, and turned on. If the issue continues, contact the device manufacturer
- Adding \u201c%1$s\u201d isn\u2019t supported by this device
+ Adding \u201c%1$s\u201d isn\u2019t supported by this device
Try moving the device closer to your Wi\u2011Fi access point/router
@@ -2185,7 +2195,7 @@
To connect your device, choose a network
- Add this device to \u201c%1$s\u201d?
+ Add this device to \u201c%1$s\u201d?
Wi\u2011Fi shared with device
@@ -2205,9 +2215,9 @@
Verify it\u0027s you
- Wi\u2011Fi password: %1$s
+ Wi\u2011Fi password: %1$s
- Hotspot password: %1$s
+ Hotspot password: %1$s
Auto\u2011connect
@@ -2268,7 +2278,7 @@
Connect
- Connected to %1$s
+ Connected to %1$s
Connecting\u2026
@@ -2288,7 +2298,8 @@
Forget network?
-
+
+
{count, plural,
=1 {1 network}
@@ -2336,7 +2347,7 @@
Ethernet
- %1$s \u2011 Charging
+ %1$s \u2011 Charging
Hotspot connection
@@ -2488,7 +2499,7 @@
Save networks?
- Saving %d networks\u2026
+ Saving %d networks\u2026
Networks saved
@@ -2591,7 +2602,7 @@
Roaming preference
- %1$s
+ %1$s
Roaming preference
@@ -2630,7 +2641,7 @@
Call over Wi\u2011Fi. If Wi\u2011Fi is lost, call will end.
- When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\u2019s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.%1$s
+ When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\u2019s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.%1$s
@@ -2647,7 +2658,7 @@
Turn on Wi\u2011Fi calling
- Disconnected from %1$s
+ Disconnected from %1$s
Sound & vibration
@@ -2658,20 +2669,21 @@
Accounts
- Work profile accounts - %s
+ Work profile accounts - %s
Personal profile accounts
Clone profile accounts
- Work account - %s
+ Work account - %s
- Personal account - %s
+ Personal account - %s
Search
-
+
+
Display
@@ -2729,7 +2741,7 @@
Disable default frame rate for games
- Disable limiting the maximum frame rate for games at %1$d Hz.
+ Disable limiting the maximum frame rate for games at %1$d Hz.
Smooth display
@@ -2899,7 +2911,7 @@
Never
- On / %1$s
+ On / %1$s
Off
@@ -2967,19 +2979,19 @@
Cancel
- Use %1$s for mobile data?
+ Use %1$s for mobile data?
- You\u0027re using %2$s for mobile data.
- If you switch to %1$s,
- %2$s will no longer be used for mobile
+ You\u0027re using %2$s for mobile data.
+ If you switch to %1$s,
+ %2$s will no longer be used for mobile
data.
- Use %1$s
+ Use %1$s
Update preferred SIM?
@@ -2989,7 +3001,7 @@
Improve mobile data coverage?
- Allow your device to automatically switch to %1$s for mobile data when it has better availability.
+ Allow your device to automatically switch to %1$s for mobile data when it has better availability.
\n\nCalls, messages, and network traffic may be visible to your organization.
@@ -3039,9 +3051,9 @@
Not available
- Storage
+ Storage
- Storage & cache
+ Storage & cache
Storage settings
@@ -3152,24 +3164,24 @@
Other users
- ^1 ^2
+ ^1 ^2
- %1$s is mounted
+ %1$s is mounted
- Couldn\u2019t mount %1$s
+ Couldn\u2019t mount %1$s
- %1$s is safely ejected
+ %1$s is safely ejected
- Couldn\u2019t safely eject %1$s
+ Couldn\u2019t safely eject %1$s
Rename storage
- This ^1 is corrupted.
-\n\nTo use this ^1, you have to set it up first.
+ This ^1 is corrupted.
+\n\nTo use this ^1, you have to set it up first.
You can format this SD card to store photos, videos, music,
@@ -3179,56 +3191,56 @@
\n\nBack up photos & other media
\nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable.
\n\nBack up apps
-\nAll apps stored on this ^1 will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device.
+\nAll apps stored on this ^1 will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device.
- When you eject this ^1, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted.
-\n\nThis ^1 is formatted to work on this device only. It won\u2019t work on any others.
+ When you eject this ^1, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted.
+\n\nThis ^1 is formatted to work on this device only. It won\u2019t work on any others.
- To use the apps, photos, or data this ^1 contains, reinsert it.
+ To use the apps, photos, or data this ^1 contains, reinsert it.
\n\nAlternatively, you can choose to forget this storage if the device isn\u2019t available.
\n\nIf you choose to forget, all the data the device contains will be lost forever.
\n\nYou can reinstall the apps later, but their data stored on this device will be lost.
- Forget ^1?
+ Forget ^1?
- All the apps, photos, and data stored on this ^1 will be lost forever.
+ All the apps, photos, and data stored on this ^1 will be lost forever.
- System includes files used to run Android version %s
+ System includes files used to run Android version %s
Guest mode users cannot format SD cards
- Formatting ^1\u2026
+ Formatting ^1\u2026
- Don\u2019t remove the ^1 while it\u2019s being formatted.
+ Don\u2019t remove the ^1 while it\u2019s being formatted.
- ^1 formatted
+ ^1 formatted
- Move ^1
+ Move ^1
- Moving ^1 and its data to ^2 will take only a few moments. You won\u2019t be able to use the app until the move is complete.
-\n\nDon\u2019t remove the ^2 during the move.
+ Moving ^1 and its data to ^2 will take only a few moments. You won\u2019t be able to use the app until the move is complete.
+\n\nDon\u2019t remove the ^2 during the move.
- To move data you need to unlock user ^1.
+ To move data you need to unlock user ^1.
- Moving ^1\u2026
+ Moving ^1\u2026
- Don\u2019t remove the ^1 during the move.
-\n\nThe ^2 app on this device won\u2019t be available until the move is complete.
+ Don\u2019t remove the ^1 during the move.
+\n\nThe ^2 app on this device won\u2019t be available until the move is complete.
- How will you use this ^1?
+ How will you use this ^1?
Or
@@ -3241,23 +3253,23 @@
Set up later
- Format this ^1?
+ Format this ^1?
- This ^1 needs to be formatted to store apps, files, and media.
-\n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device.
+ This ^1 needs to be formatted to store apps, files, and media.
+\n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device.
- This ^1 needs to be formatted to store photos, videos, music, and more.
- \n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device.
+ This ^1 needs to be formatted to store photos, videos, music, and more.
+ \n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device.
- Format ^1
+ Format ^1
- Move content to ^1?
+ Move content to ^1?
During the move:
- Don\u2019t remove the ^1
+ Don\u2019t remove the ^1
Some apps won\u2019t work
@@ -3270,22 +3282,22 @@
Moving content\u2026
- Slow ^1
+ Slow ^1
- You can still use this ^1, but it may be slow.
-\n\nApps stored on this ^2 may not work properly, and content transfers could take a long time.
-\n\nTry using a faster ^3, or use this ^4 for portable storage instead.
+ You can still use this ^1, but it may be slow.
+\n\nApps stored on this ^2 may not work properly, and content transfers could take a long time.
+\n\nTry using a faster ^3, or use this ^4 for portable storage instead.
Start over
Continue
- You can start using your ^1
+ You can start using your ^1
- You can start using your ^1
+ You can start using your ^1
- You can start using your ^1
+ You can start using your ^1
Battery status
@@ -3457,7 +3469,7 @@
Factory reset is not available for this user
- Erasing
+ Erasing
Please wait\u2026
@@ -3662,19 +3674,24 @@
Regulatory labels
Safety & regulatory manual
-
+
+
Copyright
-
+
+
License
-
+
+
Google Play system update licenses
-
+
+
Terms and conditions
-
+
+
System WebView License
@@ -3687,7 +3704,8 @@
There is a problem loading the manual.
-
+
+
Third-party licenses
@@ -3952,7 +3970,8 @@
Same as device screen lock
-
+
+
Manage apps
@@ -4134,11 +4153,11 @@
Archiving failed
- Archived %1$s
+ Archived %1$s
Restoring failed
- Restoring %1$s
+ Restoring %1$s
@@ -4169,7 +4188,8 @@
More info on %1$s
-
+
+
Running
@@ -4272,7 +4292,8 @@
Stop system service?
-
+
+
Languages, input & gestures
@@ -4348,11 +4369,11 @@
Bounce keys
- The keyboard ignores quickly repeated presses of the same key within %1$d ms
+ The keyboard ignores quickly repeated presses of the same key within %1$d ms
Slow keys
- Adjusts the time it takes for a key press to activate to %1$d ms
+ Adjusts the time it takes for a key press to activate to %1$d ms
Sticky keys
@@ -4481,13 +4502,13 @@
Choose a new key for %1$s:
- %s layout
+ %s layout
Default
- Automatic: %s
+ Automatic: %s
- User selected: %s
+ User selected: %s
Speech
@@ -4502,7 +4523,8 @@
Send vibration to game controller when connected
-
+
+
Choose keyboard layout
@@ -4512,13 +4534,15 @@
Default
-
+
+
Keyboard layouts
Physical keyboard layouts
-
+
+
Personal dictionary
@@ -4763,7 +4787,7 @@
Magnify with shortcut & triple-tap
- About %1$s
+ About %1$s
Display size and text
@@ -4816,7 +4840,7 @@
When magnification is turned on, you can zoom in on your screen.\n\nTo zoom, start magnification, then tap anywhere on the screen.\n- Drag 2 or more fingers to scroll
\n- Pinch 2 or more fingers to adjust zoom
\n\nTo zoom temporarily, start magnification, then touch & hold anywhere on the screen.\n- Drag to move around the screen
\n- Lift finger to zoom out
\n\nYou can’t zoom in on the keyboard or navigation bar.
- Page %1$d of %2$d
+ Page %1$d of %2$d
Use accessibility button to open
@@ -4830,7 +4854,7 @@
Use accessibility gesture
- To use this feature, tap the accessibility button %s on the bottom of your screen.\n\nTo switch between features, touch & hold the accessibility button.
+ To use this feature, tap the accessibility button %s on the bottom of your screen.\n\nTo switch between features, touch & hold the accessibility button.
To use this feature, tap the accessibility button on your screen.
@@ -4852,7 +4876,7 @@
Button settings
- %1$s shortcut
+ %1$s shortcut
Accessibility button
@@ -4866,7 +4890,7 @@
Use accessibility gesture
- Tap the accessibility button %s at the bottom of your screen.\n\nTo switch between features, touch & hold the accessibility button.
+ Tap the accessibility button %s at the bottom of your screen.\n\nTo switch between features, touch & hold the accessibility button.
Swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold.
@@ -4874,7 +4898,7 @@
More options
- Learn more about %1$s
+ Learn more about %1$s
Hold volume keys
@@ -4896,9 +4920,9 @@
Advanced
- The Accessibility button is set to %1$s. To use magnification, touch & hold the Accessibility button, then select magnification.
+ The Accessibility button is set to %1$s. To use magnification, touch & hold the Accessibility button, then select magnification.
- The accessibility gesture is set to the %1$s. To use magnification, swipe up with two fingers from the bottom of the screen and hold. Then select magnification.
+ The accessibility gesture is set to the %1$s. To use magnification, swipe up with two fingers from the bottom of the screen and hold. Then select magnification.
Volume key shortcut
@@ -5104,13 +5128,13 @@
Touch feedback
- Use %1$s
+ Use %1$s
- Open %1$s
+ Open %1$s
- %1$s added to Quick Settings. Swipe down to turn it on or off anytime.
+ %1$s added to Quick Settings. Swipe down to turn it on or off anytime.
- You can also add %1$s to Quick Settings from the top of your screen
+ You can also add %1$s to Quick Settings from the top of your screen
Color correction added to Quick Settings. Swipe down to turn it on or off anytime.
@@ -5150,7 +5174,7 @@
Caption size and style
- %1$s text size
+ %1$s text size
More options
@@ -5185,15 +5209,15 @@
On the next screen, tap on your hearing aids. You may need to pair the left and right ears separately.\n\nMake sure your hearing aids are turned on and ready to pair.
- %1$s active
+ %1$s active
- %1$s, left only
+ %1$s, left only
- %1$s, right only
+ %1$s, right only
- %1$s, left and right
+ %1$s, left and right
- %1$s +1 more
+ %1$s +1 more
Pair new device
@@ -5353,7 +5377,7 @@
Default
- Color
+ Color
Default
@@ -5382,10 +5406,10 @@
Allow
- %1$s to have full control of your
+ %1$s to have full control of your
device?
- %1$s
+ %1$s
needs to:
- %1$s is requesting full control of this device. The service
+ %1$s is requesting full control of this device. The service
can read the screen and act on behalf of users with accessibility needs.
This level of control is not appropriate for most apps.
@@ -5433,7 +5456,7 @@
Keep on
- Turn off %1$s?
+ Turn off %1$s?
No services installed
@@ -5564,19 +5587,19 @@
%1$s\n%2$s
- Configuring %1$s
+ Configuring %1$s
- Printing %1$s
+ Printing %1$s
- Cancelling %1$s
+ Cancelling %1$s
- Printer error %1$s
+ Printer error %1$s
- Printer blocked %1$s
+ Printer blocked %1$s
Search box shown
@@ -5641,7 +5664,7 @@
Changing how an app uses your battery can affect its performance.
- This app requires %1$s battery usage.
+ This app requires %1$s battery usage.
unrestricted
@@ -5774,7 +5797,7 @@
}
- Restricted %1$s
+ Restricted %1$s
These apps are restricted from background battery usage. They may not work as expected, and notifications may be delayed.
@@ -5796,7 +5819,7 @@
}
- ^1 %
+ ^1 %
Problem reading the battery meter.
@@ -5896,7 +5919,7 @@
Battery Saver turns on if your battery is likely to run out before your next typical charge
- Will turn on at %1$s
+ Will turn on at %1$s
Set a schedule
@@ -5908,10 +5931,10 @@
Turn off when charged
- Turn off at %1$s
+ Turn off at %1$s
- Battery Saver turns off when battery reaches %1$s
+ Battery Saver turns off when battery reaches %1$s
%1$s
@@ -5953,9 +5976,9 @@
App usage for %s
- System usage since last full charge to %s
+ System usage since last full charge to %s
- App usage since last full charge to %s
+ App usage since last full charge to %s
Total: less than a min
@@ -5979,7 +6002,7 @@
%1$s %2$s
- %1$s %2$s
+ %1$s %2$s
Battery usage chart
@@ -6020,7 +6043,7 @@
%3$s
- %1$s
+ %1$s
of RAM used over
%2$s
@@ -6080,7 +6103,8 @@
Cached
-
+
+
Voice input & output
@@ -6090,7 +6114,8 @@
Android keyboard
-
+
+
Voice input settings
@@ -6116,7 +6141,8 @@
behalf. It comes from the %s
application. Enable the use of this service?
-
+
+
On-device recognition settings
@@ -6158,9 +6184,9 @@
Not secure
- %d not secure
+ %d not secure
- %d not secure
+ %d not secure
Adaptive connectivity
@@ -6225,7 +6251,7 @@
Certificate not installed
- Allow ^1 to install certificates on this device?
+ Allow ^1 to install certificates on this device?
These certificates will verify you by sharing your device\u2019s unique ID with the apps and URLs below
@@ -6259,7 +6285,8 @@
Set behavior when an emergency call is placed
-
+
+
Backup
@@ -6293,7 +6320,8 @@
Stop backing up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps), plus erase all copies on remote servers?
Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages, and photos.
-
+
+
Device admin settings
@@ -6325,7 +6353,7 @@
following operations:
This device will be managed and monitored by
- %1$s.
+ %1$s.
This admin app is active and allows
the app %1$s to perform the
@@ -6402,7 +6430,8 @@
Disabling background data extends battery life and lowers data use. Some apps may still use the background data connection.
-
+
+
Sync is ON
@@ -6562,9 +6591,9 @@
Limiting data usage
- ^1 ^2\nwarning
+ ^1 ^2\nwarning
- ^1 ^2\nlimit
+ ^1 ^2\nlimit
@@ -6628,7 +6657,7 @@
Forget
- Connect to %s
+ Connect to %s
Disconnect this VPN?
@@ -6652,7 +6681,7 @@
Turn on
- %1$s can\'t connect
+ %1$s can\'t connect
This app doesn\'t support always-on VPN
@@ -6740,7 +6769,7 @@
Credential details
- Removed credential: %s
+ Removed credential: %s
No user credentials installed
@@ -6766,7 +6795,8 @@
"system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
Additional system updates
-
+
+
@@ -6815,7 +6845,7 @@
Admin
- You (%s)
+ You (%s)
You can\u2019t add any more users. Remove a user to add a new one.
@@ -6898,10 +6928,10 @@
Emergency information
- Info & contacts for %1$s
+ Info & contacts for %1$s
- Open %1$s
+ Open %1$s
Allow apps and content
@@ -6915,7 +6945,8 @@
Install available apps
-
+
+
Contactless payments
@@ -6925,7 +6956,8 @@
Learn more
-
+
+
Set work app as default payment app?
@@ -6972,8 +7004,7 @@
At a contactless terminal, pay with
%1$s
- At a contactless terminal, pay with %1$s.\n\nThis replaces %2$s as your default
+ At a contactless terminal, pay with %1$s.\n\nThis replaces %2$s as your default
payment app.
@@ -6982,7 +7013,8 @@
Update
Work
-
+
+
Restrictions
@@ -6991,7 +7023,8 @@
Change PIN
-
+
+
Help & feedback
@@ -7221,7 +7254,7 @@
- Send contacts to %1$s?
+ Send contacts to %1$s?
- Your contacts\u2019 phone numbers will be periodically sent to %1$s.\n\nThis info identifies whether your contacts can use certain features, like video calls or some messaging features.
+ Your contacts\u2019 phone numbers will be periodically sent to %1$s.\n\nThis info identifies whether your contacts can use certain features, like video calls or some messaging features.
- Your contacts\u2019 phone numbers will be periodically sent to your carrier.\n\nThis info identifies whether your contacts can use certain features, like video calls or some messaging features.
+ Your contacts\u2019 phone numbers will be periodically sent to your carrier.\n\nThis info identifies whether your contacts can use certain features, like video calls or some messaging features.
Preferred network type
@@ -7283,7 +7316,7 @@
Location
- Let apps use your location information
+ Let apps use your location information
Back
@@ -7310,11 +7343,11 @@
Switching data SIM, this may take up to a minute\u2026
- Use %1$s for mobile data?
+ Use %1$s for mobile data?
- If you switch to %1$s, %2$s will no longer be used for mobile data.
+ If you switch to %1$s, %2$s will no longer be used for mobile data.
- Use %1$s
+ Use %1$s
Call with
@@ -7639,7 +7672,7 @@
Notification volume muted, notifications will vibrate
- %1$s muted
+ %1$s muted
Unavailable because ring is muted
@@ -7720,10 +7753,10 @@
Off
- On / %1$s
+ On / %1$s
- On / %1$s and %2$s
+ On / %1$s and %2$s
You can also turn on Spatial Audio for Bluetooth devices.
@@ -7789,7 +7822,7 @@
Use schedule
- %1$s: %2$s
+ %1$s: %2$s
Allow interruptions that make sound
@@ -7885,19 +7918,19 @@
Turn off now
- Do Not Disturb is on until %s
+ Do Not Disturb is on until %s
Do Not Disturb will stay on until you turn it off
- Do Not Disturb was automatically turned on by a schedule (%s)
+ Do Not Disturb was automatically turned on by a schedule (%s)
- Do Not Disturb was automatically turned on by an app (%s)
+ Do Not Disturb was automatically turned on by an app (%s)
- Do Not Disturb is on for %s with custom settings.
+ Do Not Disturb is on for %s with custom settings.
View custom settings
@@ -7906,7 +7939,7 @@
Priority only
- %1$s. %2$s
+ %1$s. %2$s
On / %1$s
@@ -8331,7 +8364,7 @@
Clear
- Clear %1$s
+ Clear %1$s
Priority and modified conversations will appear here
@@ -8368,7 +8401,7 @@
Shows at top of conversation section, appears as floating bubble, displays profile picture on lock screen
- %1$s doesn\u2019t support most conversation features. You can’t set a conversation as priority, and conversations won’t appear as floating bubbles.
+ %1$s doesn\u2019t support most conversation features. You can’t set a conversation as priority, and conversations won’t appear as floating bubbles.
@@ -8388,10 +8421,10 @@
When device is unlocked, show notifications as a banner across the top of the screen
- All \"%1$s\" notifications
+ All \"%1$s\" notifications
- All %1$s notifications
+ All %1$s notifications
{count, plural,
@@ -8441,7 +8474,7 @@
Allow notification access for
- %1$s?
+ %1$s?
@@ -8506,7 +8539,7 @@
Allow VR service access for
- %1$s?
+ %1$s?
@@ -8583,7 +8616,7 @@
- Trust work %1$s with your personal data?
+ Trust work %1$s with your personal data?
- This app can access data in your personal %1$s app.
+ This app can access data in your personal %1$s app.
@@ -8605,7 +8638,7 @@
- This app can use your personal %1$s app\u2019s permissions, like access to location, storage, or contacts.
+ This app can use your personal %1$s app\u2019s permissions, like access to location, storage, or contacts.
@@ -8620,12 +8653,12 @@
- To connect these apps, install %1$s in your work profile
+ To connect these apps, install %1$s in your work profile
- To connect these apps, install %1$s in your personal profile
+ To connect these apps, install %1$s in your personal profile
- Delete \u201c%1$s\u201d rule?
+ Delete \u201c%1$s\u201d rule?
Delete
- These settings can\'t be changed right now. An app (%1$s) has automatically turned on Do Not Disturb with custom behavior."
+ These settings can\'t be changed right now. An app (%1$s) has automatically turned on Do Not Disturb with custom behavior."
These settings can\'t be changed right now. An app has automatically turned on Do Not Disturb with custom behavior."
@@ -8791,10 +8824,10 @@
Rule not found.
- On / %1$s
+ On / %1$s
- %1$s\n%2$s
+ %1$s\n%2$s
Days
@@ -8818,13 +8851,13 @@
Create custom settings for this schedule
- For \u2018%1$s\u2019
+ For \u2018%1$s\u2019
,\u0020
- %1$s - %2$s
+ %1$s - %2$s
Conversations
@@ -8859,7 +8892,7 @@
To make sure allowed calls make sound, check that device is set to ring
- For \u2018%1$s\u2019 incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.
+ For \u2018%1$s\u2019 incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.
Starred contacts
@@ -8888,7 +8921,7 @@
To make sure allowed messages make sound, check that device is set to ring
- For \u2018%1$s\u2019 incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.
+ For \u2018%1$s\u2019 incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.
All messages can reach you
@@ -9029,9 +9062,9 @@
repeat callers
- %1$s
+ %1$s
- %1$s and %2$s
+ %1$s and %2$s
If the same person calls a second time within a %d-minute period
@@ -9040,7 +9073,7 @@
End time
- %s next day
+ %s next day
Change to alarms only indefinitely
@@ -9055,7 +9088,7 @@
other {Change to alarms only for # hours until {time}}
}
- Change to alarms only until %1$s
+ Change to alarms only until %1$s
Change to always interrupt
@@ -9220,17 +9253,17 @@
Add
- Opens in %s
+ Opens in %s
- %1$s used in %2$s
+ %1$s used in %2$s
internal storage
external storage
- %1$s used since %2$s
+ %1$s used since %2$s
Storage used
@@ -9246,7 +9279,7 @@
On
- %1$s / %2$s
+ %1$s / %2$s
Off
@@ -9336,10 +9369,10 @@
Don\u2019t open supported links
- Open %s
+ Open %s
- Open %s and other URLs
+ Open %s and other URLs
Allow app to open supported links
@@ -9399,16 +9432,16 @@
Memory
- Always running (%s)
+ Always running (%s)
- Sometimes running (%s)
+ Sometimes running (%s)
- Rarely running (%s)
+ Rarely running (%s)
- %1$s / %2$s
+ %1$s / %2$s
Battery optimization
@@ -9430,12 +9463,12 @@
- Allowing %1$s to always run in the background may reduce battery life.
+ Allowing %1$s to always run in the background may reduce battery life.
\n\nYou can change this later from Settings > Apps.
- %1$s use since last full charge
+ %1$s use since last full charge
- %1$s use for past 24 hours
+ %1$s use for past 24 hours
No battery use since last full charge
@@ -9596,7 +9629,7 @@
Details
- %1$s avg memory used in last 3 hours
+ %1$s avg memory used in last 3 hours
No memory used in last 3 hours
@@ -9645,7 +9678,7 @@
No data used
- Allow access to Do Not Disturb for %1$s?
+ Allow access to Do Not Disturb for %1$s?
The app will be able to turn on/off Do Not Disturb and make changes to related settings.
@@ -9653,7 +9686,7 @@
Must stay turned on because notification access is on
- Revoke access to Do Not Disturb for %1$s?
+ Revoke access to Do Not Disturb for %1$s?
All Do Not Disturb rules created by this app will be removed.
@@ -9710,7 +9743,7 @@
Allow voice activation
- Voice activation turns-on approved apps, hands-free, using voice command. Built-in adaptive sensing ensures data stays private only to you.\n\nMore about protected adaptive sensing
+ Voice activation turns-on approved apps, hands-free, using voice command. Built-in adaptive sensing ensures data stays private only to you.\n\nMore about protected adaptive sensing
Full screen notifications
@@ -9794,22 +9827,22 @@
Not connected
- %1$d apps installed
+ %1$d apps installed
- %1$s used - %2$s free
+ %1$s used - %2$s free
Dark theme, font size, brightness
- Avg %1$s of %2$s memory used
+ Avg %1$s of %2$s memory used
- Signed in as %1$s
+ Signed in as %1$s
- Updated to Android %1$s
+ Updated to Android %1$s
Update available
@@ -9988,13 +10021,13 @@
Ethernet
- ^1 mobile data
+ ^1 mobile data
- ^1 Wi-Fi data
+ ^1 Wi-Fi data
- ^1 ethernet data
+ ^1 ethernet data
Data warning & limit
@@ -10064,7 +10097,7 @@
^1 left
- Graph showing data usage between %1$s and %2$s.
+ Graph showing data usage between %1$s and %2$s.
No data in this date range
@@ -10133,7 +10166,7 @@
On
- Will turn on at %1$s
+ Will turn on at %1$s
Off
@@ -10166,22 +10199,22 @@
Reduce screen timeout to extend battery life
- %1$s used more battery
+ %1$s used more battery
- %1$s used more battery than usual
+ %1$s used more battery than usual
- %1$s used more battery while in the background
+ %1$s used more battery while in the background
- %1$s used more battery than usual while in the background
+ %1$s used more battery than usual while in the background
- %1$s used more battery while in the foreground
+ %1$s used more battery while in the foreground
- %1$s used more battery than usual while in the foreground
+ %1$s used more battery than usual while in the foreground
Battery usage anomaly
@@ -10561,7 +10594,7 @@
Number to call for help
- %1$s. Tap to change
+ %1$s. Tap to change
@@ -10590,7 +10623,7 @@
Unavailable on carrier-locked devices
Please restart the device to enable device protection feature.
- %1$s total made available\n\nLast ran on %2$s
+ %1$s total made available\n\nLast ran on %2$s
Instant apps
@@ -10611,7 +10644,7 @@
Your storage is now being managed by the storage manager
- Accounts for %1$s
+ Accounts for %1$s
Automatically sync app data
@@ -10626,14 +10659,15 @@
Sync off for all items
-
+
+
Managed device info
Changes & settings managed by your organization
- Changes & settings managed by %s
+ Changes & settings managed by %s
To provide access to your work data, your organization may change settings and install software on your device.\n\nFor more details, contact your organization\'s admin.
@@ -10681,7 +10715,7 @@
Default keyboard
- Set to %s
+ Set to %s
Always-on VPN turned on
@@ -10717,7 +10751,7 @@
This device is managed by your organization.
- This device is managed by %s.
+ This device is managed by %s.
" "
@@ -10725,11 +10759,12 @@
Restricted setting
- Restricted settings allowed for %s
+ Restricted settings allowed for %s
For your security, this setting is currently unavailable.
-
+
+
Financed device info
@@ -10834,7 +10869,7 @@
Empty trash?
- There are %1$s of files in the trash. All items will be deleted forever, and you won\u2019t be able to restore them.
+ There are %1$s of files in the trash. All items will be deleted forever, and you won\u2019t be able to restore them.
Trash is empty
@@ -10843,9 +10878,9 @@
Empty trash
- %1$s %2$s used
+ %1$s %2$s used
- %1$s %2$s total
+ %1$s %2$s total
Clear app
@@ -10862,9 +10897,9 @@
Space used
- (uninstalled for user %s)
+ (uninstalled for user %s)
- (disabled for user %s)
+ (disabled for user %s)
@@ -11094,7 +11129,7 @@
No ANGLE enabled application set
- ANGLE enabled application: %1$s
+ ANGLE enabled application: %1$s
Graphics Driver Preferences
@@ -11140,13 +11175,13 @@
Toggle app compatibility changes
- %1$s targetSdkVersion %2$d
+ %1$s targetSdkVersion %2$d
Default enabled changes
Default disabled changes
- Enabled for targetSdkVersion >= %d
+ Enabled for targetSdkVersion >= %d
App compatibility changes can only be modified for debuggable apps. Install a debuggable app and try again.
@@ -11202,7 +11237,7 @@
Play media to
- Play %s on
+ Play %s on
Audio will play on
@@ -11268,7 +11303,7 @@
Requires SIM to connect
- Requires %s SIM to connect
+ Requires %s SIM to connect
@@ -11479,7 +11514,7 @@
Network & internet page (if there are no other SIMs), or on the mobile network list page.
[CHAR LIMIT=50] -->
- Tap to activate your %1$s SIM
+ Tap to activate your %1$s SIM
- Invalid Network Mode %1$d. Ignore.
+ Invalid Network Mode %1$d. Ignore.
Satellite messaging
@@ -11538,9 +11573,9 @@
About satellite messaging
- You can send and receive text messages by satellite as part of an eligible %1$s account
+ You can send and receive text messages by satellite as part of an eligible %1$s account
- Your %1$s plan
+ Your %1$s plan
Satellite messaging is included with your account
@@ -11558,7 +11593,7 @@
You can text anyone, including emergency services. Your phone will reconnect to a mobile network when available.
- Satellite messaging may take longer and is available only in some areas, Weather and certain structures may affect your satellite connection. Calling by satellite isn\u2019t available.\n\nIt may take some time for changes to your account to show in Settings. Contact %1$s for details.
+ Satellite messaging may take longer and is available only in some areas, Weather and certain structures may affect your satellite connection. Calling by satellite isn\u2019t available.\n\nIt may take some time for changes to your account to show in Settings. Contact %1$s for details.
More about satellite messaging
@@ -11570,50 +11605,50 @@
apn
- Unavailable when connected to %1$s
+ Unavailable when connected to %1$s
See more
- Turn on %1$s?
+ Turn on %1$s?
Turn on SIM?
- Switch to %1$s?
+ Switch to %1$s?
Switch to using SIM card?
- Use %1$s?
+ Use %1$s?
- Only 1 SIM can be on at a time.\n\nSwitching to %1$s won\u2019t cancel your %2$s service.
+ Only 1 SIM can be on at a time.\n\nSwitching to %1$s won\u2019t cancel your %2$s service.
- Only 1 eSIM can be on at a time.\n\nSwitching to %1$s won\u2019t cancel your %2$s service.
+ Only 1 eSIM can be on at a time.\n\nSwitching to %1$s won\u2019t cancel your %2$s service.
- Only 1 SIM can be on at a time.\n\nSwitching won\u2019t cancel your %1$s service.
+ Only 1 SIM can be on at a time.\n\nSwitching won\u2019t cancel your %1$s service.
- You can use 2 SIMs at a time. To use %1$s, turn off another SIM.
+ You can use 2 SIMs at a time. To use %1$s, turn off another SIM.
- Switch to %1$s
+ Switch to %1$s
- Turn off %1$s
+ Turn off %1$s
Turning off a SIM won\u2019t cancel your service
Activating your SIM…
- Switching to %1$s…
+ Switching to %1$s…
Can\u2019t switch SIMs
Something went wrong. Can\u2019t switch SIMs.
- Turn off %1$s?
+ Turn off %1$s?
Turn off SIM?
- Turning off SIM…
+ Turning off SIM…
Can\u2019t turn off SIM
@@ -11683,7 +11718,7 @@
Next
- Turning on %1$s…
+ Turning on %1$s…
Mobile network
@@ -11697,11 +11732,11 @@
Carrier switching
- Your %1$s SIM is active
+ Your %1$s SIM is active
Tap to update SIM settings
- Switched to %1$s
+ Switched to %1$s
Switched to another carrier
@@ -11721,15 +11756,15 @@
other {# SIMs are available on this device, but only one can be used at a time}
}
- Turning on…
+ Turning on…
Couldn\u2019t turn on this SIM right now
- Use %1$s?
+ Use %1$s?
- %1$s will be used for mobile data, calls, and SMS.
+ %1$s will be used for mobile data, calls, and SMS.
No active SIMs available
@@ -11742,7 +11777,7 @@
Erase this eSIM?
- This removes %1$s service from this device, but your %1$s plan won\'t be canceled.
+ This removes %1$s service from this device, but your %1$s plan won\'t be canceled.
Erase
@@ -11766,7 +11801,7 @@
Connect to device
- %1$s
+ %1$s
app wants to use a temporary Wi\u2011Fi network to connect to your device
@@ -11828,7 +11863,7 @@
Remove this suggestion?
- Storage is low. %1$s used - %2$s free
+ Storage is low. %1$s used - %2$s free
Send feedback
@@ -11836,7 +11871,7 @@
Would you like to give us feedback on this suggestion?
- %1$s copied to clipboard.
+ %1$s copied to clipboard.
@@ -11924,7 +11959,7 @@
Can\u2019t send MMS message
- Tap to allow MMS messaging on %1$s when mobile data is off
+ Tap to allow MMS messaging on %1$s when mobile data is off
MMS message
@@ -11932,7 +11967,7 @@
Issue with SIM combination
- Using %1$s may limit functionality. Tap to learn more.
+ Using %1$s may limit functionality. Tap to learn more.
SIM combination
@@ -12194,7 +12229,7 @@
- %1$s / %2$s
+ %1$s / %2$s
Connected
@@ -12203,7 +12238,7 @@
Temporarily connected
- Temporarily using %1$s
+ Temporarily using %1$s
No connection
@@ -12213,7 +12248,7 @@
Turn off mobile data?
- You won\’t have access to data or the internet through %s. Internet will only be available via Wi\u2011Fi.
+ You won\’t have access to data or the internet through %s. Internet will only be available via Wi\u2011Fi.
your carrier
@@ -12233,13 +12268,13 @@
Allow access to messages?
- A Bluetooth device, %1$s, wants to access your messages.\n\nYou haven\u2019t connected to %2$s before.
+ A Bluetooth device, %1$s, wants to access your messages.\n\nYou haven\u2019t connected to %2$s before.
A device wants to access your contacts and call log. Tap for details.
Allow access to contacts and call log?
- A Bluetooth device, %1$s, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven\u2019t connected to %2$s before.
+ A Bluetooth device, %1$s, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven\u2019t connected to %2$s before.
Brightness
@@ -12320,7 +12355,7 @@
2G is less secure, but may improve your connection in some locations. For emergency calls, 2G is always allowed.
- %1$s requires 2G to be available
+ %1$s requires 2G to be available
Require encryption
@@ -12388,7 +12423,7 @@
Allow access to SIM?
- A Bluetooth device, %1$s, wants to access data from your SIM. This includes your contacts.\n\nWhile connected, %2$s will receive all calls made to %3$s.
+ A Bluetooth device, %1$s, wants to access data from your SIM. This includes your contacts.\n\nWhile connected, %2$s will receive all calls made to %3$s.
Bluetooth device available
@@ -12396,7 +12431,7 @@
Connect to Bluetooth device?
- %1$s wants to connect to this phone.\n\nYou haven\u2019t connected to %2$s before.
+ %1$s wants to connect to this phone.\n\nYou haven\u2019t connected to %2$s before.
Don\u2019t connect
@@ -12689,7 +12724,7 @@
Customize
- Customize %1$s
+ Customize %1$s
@@ -12757,7 +12792,7 @@
Broadcast
- Broadcast %1$s
+ Broadcast %1$s
Listen to broadcasts that are playing near you
diff --git a/Settings/src/com/android/settings/ActionDisabledByAppOpsHelper.java b/Settings/src/com/android/settings/ActionDisabledByAppOpsHelper.java
index 271b09a4..c631a762 100644
--- a/Settings/src/com/android/settings/ActionDisabledByAppOpsHelper.java
+++ b/Settings/src/com/android/settings/ActionDisabledByAppOpsHelper.java
@@ -31,6 +31,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.settingslib.HelpUtils;
+import com.cariad.cea.settings.R;
final class ActionDisabledByAppOpsHelper {
diff --git a/Settings/src/com/android/settings/ActivityPicker.java b/Settings/src/com/android/settings/ActivityPicker.java
index 4d65101d..52339121 100644
--- a/Settings/src/com/android/settings/ActivityPicker.java
+++ b/Settings/src/com/android/settings/ActivityPicker.java
@@ -48,6 +48,7 @@ import android.widget.TextView;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/Settings/src/com/android/settings/AllowBindAppWidgetActivity.java b/Settings/src/com/android/settings/AllowBindAppWidgetActivity.java
index 0272c837..99ca6f58 100644
--- a/Settings/src/com/android/settings/AllowBindAppWidgetActivity.java
+++ b/Settings/src/com/android/settings/AllowBindAppWidgetActivity.java
@@ -36,6 +36,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
+import com.cariad.cea.settings.R;
/**
* This activity is displayed when an app launches the BIND_APPWIDGET intent. This allows apps
diff --git a/Settings/src/com/android/settings/BugreportPreference.java b/Settings/src/com/android/settings/BugreportPreference.java
index 3c3e6085..4a107a3b 100644
--- a/Settings/src/com/android/settings/BugreportPreference.java
+++ b/Settings/src/com/android/settings/BugreportPreference.java
@@ -31,6 +31,7 @@ import androidx.appcompat.app.AlertDialog.Builder;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.CustomDialogPreferenceCompat;
+import com.cariad.cea.settings.R;
public class BugreportPreference extends CustomDialogPreferenceCompat {
diff --git a/Settings/src/com/android/settings/CancellablePreference.java b/Settings/src/com/android/settings/CancellablePreference.java
index 4288e8b6..7616823b 100644
--- a/Settings/src/com/android/settings/CancellablePreference.java
+++ b/Settings/src/com/android/settings/CancellablePreference.java
@@ -24,6 +24,8 @@ import android.widget.ImageView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.cariad.cea.settings.R;
+
public class CancellablePreference extends Preference implements OnClickListener {
private boolean mCancellable;
diff --git a/Settings/src/com/android/settings/CustomListPreference.java b/Settings/src/com/android/settings/CustomListPreference.java
index 978858b1..4b306cec 100644
--- a/Settings/src/com/android/settings/CustomListPreference.java
+++ b/Settings/src/com/android/settings/CustomListPreference.java
@@ -32,6 +32,7 @@ import androidx.preference.ListPreference;
import androidx.preference.ListPreferenceDialogFragmentCompat;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.cariad.cea.settings.R;
public class CustomListPreference extends ListPreference {
diff --git a/Settings/src/com/android/settings/DisplaySettings.java b/Settings/src/com/android/settings/DisplaySettings.java
index 97b9aae0..7c530c59 100644
--- a/Settings/src/com/android/settings/DisplaySettings.java
+++ b/Settings/src/com/android/settings/DisplaySettings.java
@@ -32,6 +32,7 @@ import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/Settings/src/com/android/settings/FallbackHome.java b/Settings/src/com/android/settings/FallbackHome.java
index b70470b5..3fd278e4 100644
--- a/Settings/src/com/android/settings/FallbackHome.java
+++ b/Settings/src/com/android/settings/FallbackHome.java
@@ -38,6 +38,8 @@ import android.view.View;
import android.view.WindowManager.LayoutParams;
import android.view.animation.AnimationUtils;
+import com.cariad.cea.settings.R;
+
import java.util.Objects;
public class FallbackHome extends Activity {
diff --git a/Settings/src/com/android/settings/IccLockSettings.java b/Settings/src/com/android/settings/IccLockSettings.java
index 422610a4..f9435ee1 100644
--- a/Settings/src/com/android/settings/IccLockSettings.java
+++ b/Settings/src/com/android/settings/IccLockSettings.java
@@ -60,6 +60,7 @@ import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settingslib.utils.StringUtil;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/Settings/src/com/android/settings/LegalSettings.java b/Settings/src/com/android/settings/LegalSettings.java
index 9cb3bf4e..7ac51326 100644
--- a/Settings/src/com/android/settings/LegalSettings.java
+++ b/Settings/src/com/android/settings/LegalSettings.java
@@ -21,6 +21,7 @@ import android.app.settings.SettingsEnums;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
+import com.cariad.cea.settings.R;
@SearchIndexable
public class LegalSettings extends DashboardFragment {
diff --git a/Settings/src/com/android/settings/MainClear.java b/Settings/src/com/android/settings/MainClear.java
index 7b96d42b..ef6e99f0 100644
--- a/Settings/src/com/android/settings/MainClear.java
+++ b/Settings/src/com/android/settings/MainClear.java
@@ -74,6 +74,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.template.FooterButton.ButtonType;
diff --git a/Settings/src/com/android/settings/MainClearConfirm.java b/Settings/src/com/android/settings/MainClearConfirm.java
index b5ddd1ae..032db987 100644
--- a/Settings/src/com/android/settings/MainClearConfirm.java
+++ b/Settings/src/com/android/settings/MainClearConfirm.java
@@ -49,6 +49,7 @@ import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.template.FooterButton.ButtonType;
diff --git a/Settings/src/com/android/settings/ManualDisplayActivity.java b/Settings/src/com/android/settings/ManualDisplayActivity.java
index a669c678..23ba81e5 100644
--- a/Settings/src/com/android/settings/ManualDisplayActivity.java
+++ b/Settings/src/com/android/settings/ManualDisplayActivity.java
@@ -25,6 +25,8 @@ import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
+import com.cariad.cea.settings.R;
+
import java.io.File;
/**
diff --git a/Settings/src/com/android/settings/MonitoringCertInfoActivity.java b/Settings/src/com/android/settings/MonitoringCertInfoActivity.java
index 4225d724..9f06617c 100644
--- a/Settings/src/com/android/settings/MonitoringCertInfoActivity.java
+++ b/Settings/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -34,6 +34,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.utils.StringUtil;
+import com.cariad.cea.settings.R;
import java.util.HashMap;
import java.util.Locale;
diff --git a/Settings/src/com/android/settings/ProgressCategory.java b/Settings/src/com/android/settings/ProgressCategory.java
index 804d48b3..a28410e9 100644
--- a/Settings/src/com/android/settings/ProgressCategory.java
+++ b/Settings/src/com/android/settings/ProgressCategory.java
@@ -23,6 +23,8 @@ import android.view.View;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.cariad.cea.settings.R;
+
/**
* A category with a progress spinner
*/
diff --git a/Settings/src/com/android/settings/ProxySelector.java b/Settings/src/com/android/settings/ProxySelector.java
index 57d3c6a7..bd02812a 100644
--- a/Settings/src/com/android/settings/ProxySelector.java
+++ b/Settings/src/com/android/settings/ProxySelector.java
@@ -43,6 +43,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.net.module.util.ProxyUtils;
import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
import com.android.settings.core.InstrumentedFragment;
+import com.cariad.cea.settings.R;
import java.util.Arrays;
diff --git a/Settings/src/com/android/settings/RegulatoryInfoDisplayActivity.kt b/Settings/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
index fdf66c36..58cb6879 100644
--- a/Settings/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
+++ b/Settings/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
@@ -15,7 +15,7 @@
*/
package com.android.settings
-
+import com.cariad.cea.settings.R
import android.app.Activity
import android.os.Bundle
import android.view.Gravity
diff --git a/Settings/src/com/android/settings/RemoteBugreportActivity.java b/Settings/src/com/android/settings/RemoteBugreportActivity.java
index 20cc059d..41d92034 100644
--- a/Settings/src/com/android/settings/RemoteBugreportActivity.java
+++ b/Settings/src/com/android/settings/RemoteBugreportActivity.java
@@ -31,6 +31,8 @@ import android.util.Log;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
+import com.cariad.cea.settings.R;
+
/**
* UI for the remote bugreport dialog. Shows one of 3 possible dialogs:
*
diff --git a/Settings/src/com/android/settings/ResetNetwork.java b/Settings/src/com/android/settings/ResetNetwork.java
index c33a4f82..a2ae2aa2 100644
--- a/Settings/src/com/android/settings/ResetNetwork.java
+++ b/Settings/src/com/android/settings/ResetNetwork.java
@@ -52,6 +52,7 @@ import com.android.settings.network.SubscriptionUtil;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/Settings/src/com/android/settings/ResetNetworkConfirm.java b/Settings/src/com/android/settings/ResetNetworkConfirm.java
index c707b96a..ea2e6ef6 100644
--- a/Settings/src/com/android/settings/ResetNetworkConfirm.java
+++ b/Settings/src/com/android/settings/ResetNetworkConfirm.java
@@ -39,6 +39,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.network.ResetNetworkOperationBuilder;
import com.android.settings.network.ResetNetworkRestrictionViewBuilder;
+import com.cariad.cea.settings.R;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/Settings/src/com/android/settings/RestrictedListPreference.java b/Settings/src/com/android/settings/RestrictedListPreference.java
index d75f1b8f..b917f8c1 100644
--- a/Settings/src/com/android/settings/RestrictedListPreference.java
+++ b/Settings/src/com/android/settings/RestrictedListPreference.java
@@ -40,6 +40,7 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreferenceHelper;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/Settings/src/com/android/settings/RestrictedSettingsFragment.java b/Settings/src/com/android/settings/RestrictedSettingsFragment.java
index 6b538b81..af85e6cb 100644
--- a/Settings/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/Settings/src/com/android/settings/RestrictedSettingsFragment.java
@@ -37,6 +37,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.cariad.cea.settings.R;
/**
* Base class for settings screens that should be pin protected when in restricted mode or
diff --git a/Settings/src/com/android/settings/SeekBarDialogPreference.java b/Settings/src/com/android/settings/SeekBarDialogPreference.java
index d0c81341..d8afb648 100644
--- a/Settings/src/com/android/settings/SeekBarDialogPreference.java
+++ b/Settings/src/com/android/settings/SeekBarDialogPreference.java
@@ -24,6 +24,7 @@ import android.widget.ImageView;
import android.widget.SeekBar;
import com.android.settingslib.CustomDialogPreferenceCompat;
+import com.cariad.cea.settings.R;
/**
* Based on frameworks/base/core/java/android/preference/SeekBarDialogPreference.java
diff --git a/Settings/src/com/android/settings/SetFullBackupPassword.java b/Settings/src/com/android/settings/SetFullBackupPassword.java
index 72522895..c59e17f5 100644
--- a/Settings/src/com/android/settings/SetFullBackupPassword.java
+++ b/Settings/src/com/android/settings/SetFullBackupPassword.java
@@ -30,6 +30,8 @@ import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
+import com.cariad.cea.settings.R;
+
public class SetFullBackupPassword extends Activity {
static final String TAG = "SetFullBackupPassword";
diff --git a/Settings/src/com/android/settings/SettingsActivity.java b/Settings/src/com/android/settings/SettingsActivity.java
index 02205c1b..0f2fc838 100644
--- a/Settings/src/com/android/settings/SettingsActivity.java
+++ b/Settings/src/com/android/settings/SettingsActivity.java
@@ -74,6 +74,7 @@ import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.core.instrumentation.SharedPreferencesLogger;
import com.android.settingslib.drawer.DashboardCategory;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.util.WizardManagerHelper;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/SettingsLicenseActivity.java b/Settings/src/com/android/settings/SettingsLicenseActivity.java
index 598c9739..609c667f 100644
--- a/Settings/src/com/android/settings/SettingsLicenseActivity.java
+++ b/Settings/src/com/android/settings/SettingsLicenseActivity.java
@@ -31,6 +31,7 @@ import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.settingslib.license.LicenseHtmlLoaderCompat;
+import com.cariad.cea.settings.R;
import java.io.File;
diff --git a/Settings/src/com/android/settings/SettingsPreferenceFragment.java b/Settings/src/com/android/settings/SettingsPreferenceFragment.java
index 66397c0e..45c2fbfd 100644
--- a/Settings/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/Settings/src/com/android/settings/SettingsPreferenceFragment.java
@@ -54,6 +54,7 @@ import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.widget.LayoutPreference;
+import com.cariad.cea.settings.R;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.setupcompat.util.WizardManagerHelper;
diff --git a/Settings/src/com/android/settings/SetupWizardUtils.java b/Settings/src/com/android/settings/SetupWizardUtils.java
index 25e91598..91628bb6 100644
--- a/Settings/src/com/android/settings/SetupWizardUtils.java
+++ b/Settings/src/com/android/settings/SetupWizardUtils.java
@@ -24,6 +24,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.sysprop.SetupWizardProperties;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper;
diff --git a/Settings/src/com/android/settings/SummaryPreference.java b/Settings/src/com/android/settings/SummaryPreference.java
index ced5cd75..c44cc062 100644
--- a/Settings/src/com/android/settings/SummaryPreference.java
+++ b/Settings/src/com/android/settings/SummaryPreference.java
@@ -24,6 +24,8 @@ import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.cariad.cea.settings.R;
+
/**
* Provides a summary of a setting page in a preference. Such as memory or data usage.
*/
diff --git a/Settings/src/com/android/settings/TestingSettings.java b/Settings/src/com/android/settings/TestingSettings.java
index 48b5be37..c6e41d9d 100644
--- a/Settings/src/com/android/settings/TestingSettings.java
+++ b/Settings/src/com/android/settings/TestingSettings.java
@@ -25,6 +25,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import com.android.settings.network.telephony.MobileNetworkUtils;
+import com.cariad.cea.settings.R;
public class TestingSettings extends SettingsPreferenceFragment {
diff --git a/Settings/src/com/android/settings/TrustedCredentialsDialogBuilder.java b/Settings/src/com/android/settings/TrustedCredentialsDialogBuilder.java
index 93d5ebb0..6065d2cf 100644
--- a/Settings/src/com/android/settings/TrustedCredentialsDialogBuilder.java
+++ b/Settings/src/com/android/settings/TrustedCredentialsDialogBuilder.java
@@ -36,6 +36,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.TrustedCredentialsFragment.CertHolder;
import com.android.settingslib.RestrictedLockUtils;
+import com.cariad.cea.settings.R;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/TrustedCredentialsFragment.java b/Settings/src/com/android/settings/TrustedCredentialsFragment.java
index a150850f..a3e0439c 100644
--- a/Settings/src/com/android/settings/TrustedCredentialsFragment.java
+++ b/Settings/src/com/android/settings/TrustedCredentialsFragment.java
@@ -68,6 +68,7 @@ import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.TrustedCredentialsSettings.Tab;
import com.android.settingslib.core.lifecycle.ObservableFragment;
+import com.cariad.cea.settings.R;
import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
diff --git a/Settings/src/com/android/settings/TrustedCredentialsSettings.java b/Settings/src/com/android/settings/TrustedCredentialsSettings.java
index a88019ed..11ce7e39 100644
--- a/Settings/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/Settings/src/com/android/settings/TrustedCredentialsSettings.java
@@ -31,6 +31,7 @@ import androidx.viewpager2.widget.ViewPager2;
import com.android.settings.dashboard.DashboardFragment;
+import com.cariad.cea.settings.R;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.google.common.collect.ImmutableList;
diff --git a/Settings/src/com/android/settings/UserCredentialsSettings.java b/Settings/src/com/android/settings/UserCredentialsSettings.java
index 49506502..d8fa50e9 100644
--- a/Settings/src/com/android/settings/UserCredentialsSettings.java
+++ b/Settings/src/com/android/settings/UserCredentialsSettings.java
@@ -54,6 +54,7 @@ import com.android.settings.wifi.helper.SavedWifiHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.cariad.cea.settings.R;
import java.security.Key;
import java.security.KeyStore;
diff --git a/Settings/src/com/android/settings/Utils.java b/Settings/src/com/android/settings/Utils.java
index 108e331a..4327dbed 100644
--- a/Settings/src/com/android/settings/Utils.java
+++ b/Settings/src/com/android/settings/Utils.java
@@ -118,6 +118,7 @@ import com.android.settings.dashboard.profileselector.ProfileSelectFragment.Prof
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.widget.ActionBarShadowController;
import com.android.settingslib.widget.AdaptiveIcon;
+import com.cariad.cea.settings.R;
import java.util.Iterator;
import java.util.List;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragment.java b/Settings/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragment.java
index 6eb2112d..90113a3b 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragment.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragment.java
@@ -20,7 +20,7 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
index bd461520..491dd279 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
@@ -22,7 +22,7 @@ import android.text.Html;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Preference controller for accessibility button footer.
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityButtonFragment.java b/Settings/src/com/android/settings/accessibility/AccessibilityButtonFragment.java
index 2df11a97..a9c9b3c7 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityButtonFragment.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityButtonFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java
index 53d9c55f..f6e6403a 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java
@@ -22,7 +22,7 @@ import android.content.res.Resources;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.search.SearchIndexableRaw;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceController.java
index 22552eaa..b0711700 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceController.java
@@ -28,7 +28,7 @@ import android.view.accessibility.AccessibilityManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceController.java
index 5805a160..0b7ecb07 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Preference controller for accessibility control timeout footer.
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
index d7e33ae2..935ed88f 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/Settings/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
index 4e9cd92d..249b7853 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
@@ -39,7 +39,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityDialogUtils.java b/Settings/src/com/android/settings/accessibility/AccessibilityDialogUtils.java
index ca3a7b1d..c04e62b2 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityDialogUtils.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityDialogUtils.java
@@ -53,7 +53,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import com.android.server.accessibility.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.widget.LottieColorUtils;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/Settings/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
index 1f71ab0a..e1f2b09c 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
@@ -55,7 +55,7 @@ import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import com.android.server.accessibility.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.widget.LottieColorUtils;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
index fab6e477..0096aa73 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
@@ -32,7 +32,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.bluetooth.BluetoothCallback;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java b/Settings/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
index cad21868..7f4e3316 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
@@ -29,7 +29,7 @@ import android.view.ViewGroup;
import androidx.preference.PreferenceCategory;
import com.android.internal.accessibility.AccessibilityShortcutController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityLayerDrawable.java b/Settings/src/com/android/settings/accessibility/AccessibilityLayerDrawable.java
index 8b4fd02b..0eb5d972 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityLayerDrawable.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityLayerDrawable.java
@@ -23,7 +23,7 @@ import android.graphics.drawable.LayerDrawable;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Objects;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
index e82cd96e..23d6d37b 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
@@ -23,7 +23,7 @@ import android.os.Handler;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java b/Settings/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java
index bb6dba8f..12ffd158 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java
@@ -35,7 +35,7 @@ import android.widget.TextView;
import androidx.annotation.DrawableRes;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* UI container for the accessibility quick settings tooltip.
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/Settings/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index fb50ef15..2ff92e9a 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -38,7 +38,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Locale;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilitySettings.java b/Settings/src/com/android/settings/accessibility/AccessibilitySettings.java
index fe89bf20..d9bc5c28 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -41,7 +41,7 @@ import androidx.preference.PreferenceCategory;
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.accessibility.util.AccessibilityUtils;
import com.android.internal.content.PackageMonitor;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.inputmethod.PhysicalKeyboardFragment;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/Settings/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
index fdf75924..9629b8e4 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
@@ -38,7 +38,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/Settings/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 57047f9c..81a97ca7 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -23,7 +23,7 @@ import android.view.accessibility.AccessibilityEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java
index d204bb76..49724dcf 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java
@@ -23,7 +23,7 @@ import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index 09a691ed..611fd5c2 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -42,7 +42,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
import com.android.settings.dashboard.RestrictedDashboardFragment;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
index dd6edebf..aa9beddc 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
@@ -26,7 +26,7 @@ import android.content.Context;
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.accessibility.AccessibilityUtils;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityTimeoutController.java b/Settings/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
index b306cd88..1b1b9f57 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
@@ -27,7 +27,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java b/Settings/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java
index d703a92f..a4c4c46f 100644
--- a/Settings/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.google.common.primitives.Ints;
diff --git a/Settings/src/com/android/settings/accessibility/ArrowPreference.java b/Settings/src/com/android/settings/accessibility/ArrowPreference.java
index ccee50df..00a7aa94 100644
--- a/Settings/src/com/android/settings/accessibility/ArrowPreference.java
+++ b/Settings/src/com/android/settings/accessibility/ArrowPreference.java
@@ -23,7 +23,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.res.TypedArrayUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A settings preference with colored rounded rectangle background and an arrow icon on the right.
diff --git a/Settings/src/com/android/settings/accessibility/AudioAdjustmentFragment.java b/Settings/src/com/android/settings/accessibility/AudioAdjustmentFragment.java
index c80216b1..91de4b7f 100644
--- a/Settings/src/com/android/settings/accessibility/AudioAdjustmentFragment.java
+++ b/Settings/src/com/android/settings/accessibility/AudioAdjustmentFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/AudioDescriptionPreferenceController.java b/Settings/src/com/android/settings/accessibility/AudioDescriptionPreferenceController.java
index a05a0d03..ea2678dd 100644
--- a/Settings/src/com/android/settings/accessibility/AudioDescriptionPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AudioDescriptionPreferenceController.java
@@ -25,7 +25,7 @@ import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/accessibility/AutoclickPreferenceController.java b/Settings/src/com/android/settings/accessibility/AutoclickPreferenceController.java
index dc219d67..f364e7d6 100644
--- a/Settings/src/com/android/settings/accessibility/AutoclickPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/AutoclickPreferenceController.java
@@ -23,7 +23,7 @@ import android.content.Context;
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/** Preference controller for autoclick (dwell timing). */
diff --git a/Settings/src/com/android/settings/accessibility/AutoclickUtils.java b/Settings/src/com/android/settings/accessibility/AutoclickUtils.java
index 89f2ceb5..c1a06aeb 100644
--- a/Settings/src/com/android/settings/accessibility/AutoclickUtils.java
+++ b/Settings/src/com/android/settings/accessibility/AutoclickUtils.java
@@ -24,7 +24,7 @@ import android.annotation.StringRes;
import android.content.Context;
import android.content.res.Resources;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.StringUtil;
import java.lang.annotation.Retention;
diff --git a/Settings/src/com/android/settings/accessibility/BackgroundPreference.java b/Settings/src/com/android/settings/accessibility/BackgroundPreference.java
index ea56ac56..7c1c2be6 100644
--- a/Settings/src/com/android/settings/accessibility/BackgroundPreference.java
+++ b/Settings/src/com/android/settings/accessibility/BackgroundPreference.java
@@ -29,7 +29,7 @@ import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A preference with custom background.
diff --git a/Settings/src/com/android/settings/accessibility/BalanceSeekBar.java b/Settings/src/com/android/settings/accessibility/BalanceSeekBar.java
index 19301ae9..f17af442 100644
--- a/Settings/src/com/android/settings/accessibility/BalanceSeekBar.java
+++ b/Settings/src/com/android/settings/accessibility/BalanceSeekBar.java
@@ -34,7 +34,7 @@ import android.widget.SeekBar;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A custom seekbar for the balance setting.
diff --git a/Settings/src/com/android/settings/accessibility/BalanceSeekBarPreference.java b/Settings/src/com/android/settings/accessibility/BalanceSeekBarPreference.java
index 0254cae9..7fa24a49 100644
--- a/Settings/src/com/android/settings/accessibility/BalanceSeekBarPreference.java
+++ b/Settings/src/com/android/settings/accessibility/BalanceSeekBarPreference.java
@@ -25,7 +25,7 @@ import android.widget.ImageView;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SeekBarPreference;
/** A slider preference that directly controls audio balance **/
diff --git a/Settings/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java b/Settings/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java
index 7c96b0f9..a4f7105b 100644
--- a/Settings/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java
@@ -22,7 +22,7 @@ import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/accessibility/CaptionHelper.java b/Settings/src/com/android/settings/accessibility/CaptionHelper.java
index 36d833c4..f0740522 100644
--- a/Settings/src/com/android/settings/accessibility/CaptionHelper.java
+++ b/Settings/src/com/android/settings/accessibility/CaptionHelper.java
@@ -27,7 +27,7 @@ import android.view.accessibility.CaptioningManager;
import android.view.accessibility.CaptioningManager.CaptionStyle;
import com.android.internal.widget.SubtitleView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.google.common.annotations.VisibleForTesting;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningAppearanceFragment.java b/Settings/src/com/android/settings/accessibility/CaptioningAppearanceFragment.java
index 8b80de35..eea12d98 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningAppearanceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningAppearanceFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java b/Settings/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java
index 74cb5348..8c85ae90 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.view.accessibility.CaptioningManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.google.common.primitives.Floats;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java b/Settings/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java
index 686f725e..1f57959b 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java
@@ -23,7 +23,7 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java b/Settings/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java
index 405f6d9f..f43d9444 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java
@@ -21,7 +21,7 @@ import android.content.res.Resources;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningEdgeColorController.java b/Settings/src/com/android/settings/accessibility/CaptioningEdgeColorController.java
index 4903ff4d..f3e44516 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningEdgeColorController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningEdgeColorController.java
@@ -21,7 +21,7 @@ import android.content.res.Resources;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningFooterPreferenceController.java b/Settings/src/com/android/settings/accessibility/CaptioningFooterPreferenceController.java
index def56209..a3ef93b8 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningFooterPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Preference controller for captioning footer. */
public class CaptioningFooterPreferenceController extends AccessibilityFooterPreferenceController {
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningForegroundColorController.java b/Settings/src/com/android/settings/accessibility/CaptioningForegroundColorController.java
index 8e9ec187..1280f81a 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningForegroundColorController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningForegroundColorController.java
@@ -22,7 +22,7 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java b/Settings/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java
index ab8a84b3..68270c8c 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java
@@ -21,7 +21,7 @@ import android.content.res.Resources;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningMoreOptionsFragment.java b/Settings/src/com/android/settings/accessibility/CaptioningMoreOptionsFragment.java
index 2895e751..8dd6616c 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningMoreOptionsFragment.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningMoreOptionsFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningPreferenceController.java b/Settings/src/com/android/settings/accessibility/CaptioningPreferenceController.java
index 563aad54..c1c18f07 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class CaptioningPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningPresetController.java b/Settings/src/com/android/settings/accessibility/CaptioningPresetController.java
index f08a5f49..0c2ebd90 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningPresetController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningPresetController.java
@@ -21,7 +21,7 @@ import android.content.res.Resources;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/** Preference controller for captioning preset. */
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningPreviewPreferenceController.java b/Settings/src/com/android/settings/accessibility/CaptioningPreviewPreferenceController.java
index 73ee8469..cf78b2c5 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningPreviewPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningPreviewPreferenceController.java
@@ -27,7 +27,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.SubtitleView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningPropertiesFragment.java b/Settings/src/com/android/settings/accessibility/CaptioningPropertiesFragment.java
index 95a3307b..2bbd418e 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningPropertiesFragment.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningPropertiesFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java b/Settings/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java
index 10e1fcae..15afaffc 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java
@@ -22,7 +22,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.SettingsMainSwitchPreference;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningWindowColorController.java b/Settings/src/com/android/settings/accessibility/CaptioningWindowColorController.java
index 238a75a8..409f260e 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningWindowColorController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningWindowColorController.java
@@ -23,7 +23,7 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java b/Settings/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java
index ef288039..7d36de1c 100644
--- a/Settings/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java
+++ b/Settings/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java
@@ -21,7 +21,7 @@ import android.content.res.Resources;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/ColorAndMotionFragment.java b/Settings/src/com/android/settings/accessibility/ColorAndMotionFragment.java
index 28c53353..773f36f2 100644
--- a/Settings/src/com/android/settings/accessibility/ColorAndMotionFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ColorAndMotionFragment.java
@@ -28,7 +28,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/ColorContrastFragment.java b/Settings/src/com/android/settings/accessibility/ColorContrastFragment.java
index 904826e4..78dafe24 100644
--- a/Settings/src/com/android/settings/accessibility/ColorContrastFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ColorContrastFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/ColorInversionPreferenceController.java b/Settings/src/com/android/settings/accessibility/ColorInversionPreferenceController.java
index 5b20714c..0ce34429 100644
--- a/Settings/src/com/android/settings/accessibility/ColorInversionPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/ColorInversionPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/** Controller that shows the color inversion summary. */
diff --git a/Settings/src/com/android/settings/accessibility/ColorPreference.java b/Settings/src/com/android/settings/accessibility/ColorPreference.java
index e360a9eb..4cca3db1 100644
--- a/Settings/src/com/android/settings/accessibility/ColorPreference.java
+++ b/Settings/src/com/android/settings/accessibility/ColorPreference.java
@@ -28,7 +28,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Grid preference that allows the user to pick a color from a predefined set of
diff --git a/Settings/src/com/android/settings/accessibility/ColorSelectorLayout.java b/Settings/src/com/android/settings/accessibility/ColorSelectorLayout.java
index 02ef16d3..8a036d92 100644
--- a/Settings/src/com/android/settings/accessibility/ColorSelectorLayout.java
+++ b/Settings/src/com/android/settings/accessibility/ColorSelectorLayout.java
@@ -26,7 +26,7 @@ import android.widget.RadioButton;
import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Arrays;
import java.util.List;
diff --git a/Settings/src/com/android/settings/accessibility/ContrastSelectorPreferenceController.java b/Settings/src/com/android/settings/accessibility/ContrastSelectorPreferenceController.java
index b99680fa..65436511 100644
--- a/Settings/src/com/android/settings/accessibility/ContrastSelectorPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/ContrastSelectorPreferenceController.java
@@ -32,7 +32,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/accessibility/DaltonizerPreferenceController.java b/Settings/src/com/android/settings/accessibility/DaltonizerPreferenceController.java
index f89cb546..c6431bc8 100644
--- a/Settings/src/com/android/settings/accessibility/DaltonizerPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/DaltonizerPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/** Controller that shows and updates the color correction summary. */
diff --git a/Settings/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java b/Settings/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java
index 75d92294..3e53147c 100644
--- a/Settings/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java
@@ -27,7 +27,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java b/Settings/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
index 2333ed38..af5409a5 100644
--- a/Settings/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
@@ -28,7 +28,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/accessibility/EdgeTypePreference.java b/Settings/src/com/android/settings/accessibility/EdgeTypePreference.java
index 3bff704f..3ff1c8b8 100644
--- a/Settings/src/com/android/settings/accessibility/EdgeTypePreference.java
+++ b/Settings/src/com/android/settings/accessibility/EdgeTypePreference.java
@@ -25,7 +25,7 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
import android.widget.TextView;
import com.android.internal.widget.SubtitleView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Grid preference that allows the user to pick a captioning edge type.
diff --git a/Settings/src/com/android/settings/accessibility/FlashNotificationsFooterPreferenceController.java b/Settings/src/com/android/settings/accessibility/FlashNotificationsFooterPreferenceController.java
index 0847c37a..8905561a 100644
--- a/Settings/src/com/android/settings/accessibility/FlashNotificationsFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/FlashNotificationsFooterPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Preference controller for footer in flash notifications page. */
public class FlashNotificationsFooterPreferenceController extends
diff --git a/Settings/src/com/android/settings/accessibility/FlashNotificationsIntroPreferenceController.java b/Settings/src/com/android/settings/accessibility/FlashNotificationsIntroPreferenceController.java
index 44866f8d..203746e1 100644
--- a/Settings/src/com/android/settings/accessibility/FlashNotificationsIntroPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/FlashNotificationsIntroPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/** Preference controller that controls the text content of Flash Notifications intro. */
diff --git a/Settings/src/com/android/settings/accessibility/FlashNotificationsPreferenceController.java b/Settings/src/com/android/settings/accessibility/FlashNotificationsPreferenceController.java
index a996a765..5b02a1ed 100644
--- a/Settings/src/com/android/settings/accessibility/FlashNotificationsPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/FlashNotificationsPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.util.FeatureFlagUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java
index f7964742..98032674 100644
--- a/Settings/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java b/Settings/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java
index 5b669fa6..c1a6a065 100644
--- a/Settings/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java
+++ b/Settings/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java
@@ -26,7 +26,7 @@ import androidx.annotation.ColorInt;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
/**
diff --git a/Settings/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java b/Settings/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
index 923e8806..5247613a 100644
--- a/Settings/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.graphics.fonts.FontStyle;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.TextReadingPreferenceFragment.EntryPoint;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.core.instrumentation.SettingsStatsLog;
diff --git a/Settings/src/com/android/settings/accessibility/HearingAidCompatibilityPreferenceController.java b/Settings/src/com/android/settings/accessibility/HearingAidCompatibilityPreferenceController.java
index 727cdd53..fb3a318e 100644
--- a/Settings/src/com/android/settings/accessibility/HearingAidCompatibilityPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/HearingAidCompatibilityPreferenceController.java
@@ -23,7 +23,7 @@ import android.telephony.TelephonyManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/** Preference controller for Hearing Aid Compatibility (HAC) settings */
diff --git a/Settings/src/com/android/settings/accessibility/HearingAidDialogFragment.java b/Settings/src/com/android/settings/accessibility/HearingAidDialogFragment.java
index 7f3230fe..75534dc2 100644
--- a/Settings/src/com/android/settings/accessibility/HearingAidDialogFragment.java
+++ b/Settings/src/com/android/settings/accessibility/HearingAidDialogFragment.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.BluetoothPairingDetail;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/accessibility/HearingDeviceFooterPreferenceController.java b/Settings/src/com/android/settings/accessibility/HearingDeviceFooterPreferenceController.java
index cd924483..a01d226c 100644
--- a/Settings/src/com/android/settings/accessibility/HearingDeviceFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/HearingDeviceFooterPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Preference controller for footer in hearing device page. */
public class HearingDeviceFooterPreferenceController extends
diff --git a/Settings/src/com/android/settings/accessibility/HearingDevicePairingFragment.java b/Settings/src/com/android/settings/accessibility/HearingDevicePairingFragment.java
index 0b762f3b..ee4427ca 100644
--- a/Settings/src/com/android/settings/accessibility/HearingDevicePairingFragment.java
+++ b/Settings/src/com/android/settings/accessibility/HearingDevicePairingFragment.java
@@ -45,7 +45,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.BluetoothDevicePreference;
import com.android.settings.bluetooth.BluetoothProgressCategory;
import com.android.settings.bluetooth.Utils;
diff --git a/Settings/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java b/Settings/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java
index 7a3f4f6e..9e3fff90 100644
--- a/Settings/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.TextReadingPreferenceFragment.EntryPoint;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.core.instrumentation.SettingsStatsLog;
diff --git a/Settings/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java b/Settings/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
index 21ac9981..3685c959 100644
--- a/Settings/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
@@ -20,7 +20,7 @@ import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.DialogInterface;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.accessibility.AccessibilityUtils;
/**
diff --git a/Settings/src/com/android/settings/accessibility/ItemInfoArrayAdapter.java b/Settings/src/com/android/settings/accessibility/ItemInfoArrayAdapter.java
index a7c41771..5493c297 100644
--- a/Settings/src/com/android/settings/accessibility/ItemInfoArrayAdapter.java
+++ b/Settings/src/com/android/settings/accessibility/ItemInfoArrayAdapter.java
@@ -28,7 +28,7 @@ import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceController.java b/Settings/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceController.java
index 6d988ac1..07a1a6fd 100644
--- a/Settings/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceController.java
@@ -20,7 +20,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.hardware.input.InputSettings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.inputmethod.PhysicalKeyboardFragment;
diff --git a/Settings/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceController.java b/Settings/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceController.java
index 8bd23168..2ff4a3b9 100644
--- a/Settings/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceController.java
@@ -20,7 +20,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.hardware.input.InputSettings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.inputmethod.PhysicalKeyboardFragment;
diff --git a/Settings/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceController.java b/Settings/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceController.java
index ee5559df..c55bdb9c 100644
--- a/Settings/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceController.java
@@ -20,7 +20,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.hardware.input.InputSettings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java b/Settings/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
index 21800b91..cfb49a2d 100644
--- a/Settings/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
@@ -41,7 +41,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java b/Settings/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java
index 0220245a..74415b34 100644
--- a/Settings/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class LargePointerIconPreferenceController extends TogglePreferenceController {
diff --git a/Settings/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index 80d1ce0c..69145d62 100644
--- a/Settings/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -40,7 +40,7 @@ import android.view.accessibility.AccessibilityManager;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/accessibility/LocalePreference.java b/Settings/src/com/android/settings/accessibility/LocalePreference.java
index a3723fd4..cced9ffd 100644
--- a/Settings/src/com/android/settings/accessibility/LocalePreference.java
+++ b/Settings/src/com/android/settings/accessibility/LocalePreference.java
@@ -22,7 +22,7 @@ import android.util.AttributeSet;
import androidx.preference.ListPreference;
import com.android.internal.app.LocalePicker;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java b/Settings/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
index bde2ef59..5c0e9b55 100644
--- a/Settings/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
@@ -23,7 +23,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.display.DeviceStateAutoRotationHelper;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java b/Settings/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java
index e455aa87..bdde0f0b 100644
--- a/Settings/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java
@@ -28,7 +28,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/accessibility/MagnificationCapabilities.java b/Settings/src/com/android/settings/accessibility/MagnificationCapabilities.java
index 04a2992f..bc8b01cf 100644
--- a/Settings/src/com/android/settings/accessibility/MagnificationCapabilities.java
+++ b/Settings/src/com/android/settings/accessibility/MagnificationCapabilities.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import androidx.annotation.IntDef;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.common.primitives.Ints;
diff --git a/Settings/src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java b/Settings/src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java
index 86983e3c..5cd714e5 100644
--- a/Settings/src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java
@@ -28,7 +28,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/** Controller that accesses and switches the preference status of following typing feature */
diff --git a/Settings/src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java b/Settings/src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java
index 0a24e96f..2c19b943 100644
--- a/Settings/src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java
@@ -28,7 +28,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/accessibility/MagnificationModePreferenceController.java b/Settings/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
index 4acf2308..419241e4 100644
--- a/Settings/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
@@ -41,7 +41,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.DialogCreatable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.MagnificationCapabilities.MagnificationMode;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.utils.AnnotationSpan;
diff --git a/Settings/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceController.java b/Settings/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceController.java
index 36e7d4cf..2b1f2514 100644
--- a/Settings/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.os.VibrationAttributes;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Preference controller for am vibration intensity */
public class MediaVibrationIntensityPreferenceController
diff --git a/Settings/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceController.java b/Settings/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceController.java
index c663ad40..d6356b23 100644
--- a/Settings/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import android.content.Context;
import com.android.settings.accessibility.MediaVibrationIntensityPreferenceController.MediaVibrationPreferenceConfig;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Preference controller for alarm vibration with only a toggle for on/off states. */
public class MediaVibrationTogglePreferenceController extends VibrationTogglePreferenceController {
diff --git a/Settings/src/com/android/settings/accessibility/PaletteListPreference.java b/Settings/src/com/android/settings/accessibility/PaletteListPreference.java
index eec8b5a6..c3687284 100644
--- a/Settings/src/com/android/settings/accessibility/PaletteListPreference.java
+++ b/Settings/src/com/android/settings/accessibility/PaletteListPreference.java
@@ -38,7 +38,7 @@ import androidx.core.text.TextUtilsCompat;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.common.primitives.Floats;
import com.google.common.primitives.Ints;
diff --git a/Settings/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java b/Settings/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java
index d409fa4d..f6f8effd 100644
--- a/Settings/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/PresetPreference.java b/Settings/src/com/android/settings/accessibility/PresetPreference.java
index a0ef7b63..a4ef744d 100644
--- a/Settings/src/com/android/settings/accessibility/PresetPreference.java
+++ b/Settings/src/com/android/settings/accessibility/PresetPreference.java
@@ -23,7 +23,7 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
import android.widget.TextView;
import com.android.internal.widget.SubtitleView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Grid preference that allows the user to pick a captioning preset type. */
public class PresetPreference extends ListDialogPreference {
diff --git a/Settings/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java b/Settings/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
index f268a40c..0f24dcc1 100644
--- a/Settings/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
+++ b/Settings/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
@@ -26,7 +26,7 @@ import android.widget.SeekBar;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.LabeledSeekBarPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java b/Settings/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
index 5e69da7e..8665fa57 100644
--- a/Settings/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/accessibility/RTTSettingPreferenceController.java b/Settings/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
index 3ad2a3bc..10646b4c 100644
--- a/Settings/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.rtt.TelecomUtil;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java b/Settings/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java
index 7550a308..524095ac 100644
--- a/Settings/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/** PreferenceController for persisting feature activation state after a restart. */
diff --git a/Settings/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java b/Settings/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
index 7b40024c..55d1cbd9 100644
--- a/Settings/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
@@ -32,7 +32,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java b/Settings/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
index 03bf142f..738267e8 100644
--- a/Settings/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
+++ b/Settings/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
@@ -35,7 +35,7 @@ import android.text.TextUtils;
import androidx.core.content.ContextCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationColor.java b/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationColor.java
index ae6de3e4..b58cc185 100644
--- a/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationColor.java
+++ b/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationColor.java
@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
import androidx.annotation.ColorInt;
import androidx.annotation.StringRes;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
enum ScreenFlashNotificationColor {
BLUE(0x4D0000FE, R.string.screen_flash_color_blue),
diff --git a/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragment.java b/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragment.java
index ca77f16f..a0732ef3 100644
--- a/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragment.java
@@ -36,7 +36,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Timer;
import java.util.TimerTask;
diff --git a/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java b/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java
index bd54aca7..b97f2b61 100644
--- a/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java
@@ -28,7 +28,7 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceController.java b/Settings/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceController.java
index 16ebe9dd..30973455 100644
--- a/Settings/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceController.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.HashMap;
diff --git a/Settings/src/com/android/settings/accessibility/ShortcutPreference.java b/Settings/src/com/android/settings/accessibility/ShortcutPreference.java
index a04f8f45..e0bf1c5d 100644
--- a/Settings/src/com/android/settings/accessibility/ShortcutPreference.java
+++ b/Settings/src/com/android/settings/accessibility/ShortcutPreference.java
@@ -27,7 +27,7 @@ import android.widget.LinearLayout;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Preference that can enable accessibility shortcut and let users choose which shortcut type they
diff --git a/Settings/src/com/android/settings/accessibility/ShortcutsSettingsFragment.java b/Settings/src/com/android/settings/accessibility/ShortcutsSettingsFragment.java
index 84268349..80d7d316 100644
--- a/Settings/src/com/android/settings/accessibility/ShortcutsSettingsFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ShortcutsSettingsFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/StaticTextPreference.java b/Settings/src/com/android/settings/accessibility/StaticTextPreference.java
index 32707480..4aed4052 100644
--- a/Settings/src/com/android/settings/accessibility/StaticTextPreference.java
+++ b/Settings/src/com/android/settings/accessibility/StaticTextPreference.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A custom {@link android.widget.TextView} preference that removes the title and summary
diff --git a/Settings/src/com/android/settings/accessibility/SystemControlsFragment.java b/Settings/src/com/android/settings/accessibility/SystemControlsFragment.java
index 237f2b44..cf6651f6 100644
--- a/Settings/src/com/android/settings/accessibility/SystemControlsFragment.java
+++ b/Settings/src/com/android/settings/accessibility/SystemControlsFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/TapAssistanceFragment.java b/Settings/src/com/android/settings/accessibility/TapAssistanceFragment.java
index 1a999ea3..0c05149a 100644
--- a/Settings/src/com/android/settings/accessibility/TapAssistanceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/TapAssistanceFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
index 5976ef51..6c2dd5a4 100644
--- a/Settings/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
@@ -32,7 +32,7 @@ import android.widget.Toast;
import androidx.annotation.IntDef;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java b/Settings/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java
index 11be73c7..a8825748 100644
--- a/Settings/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java
+++ b/Settings/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java
@@ -30,7 +30,7 @@ import android.view.ViewGroup;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/accessibility/TextReadingPreviewController.java b/Settings/src/com/android/settings/accessibility/TextReadingPreviewController.java
index 4ec0b3dd..b3c66e10 100644
--- a/Settings/src/com/android/settings/accessibility/TextReadingPreviewController.java
+++ b/Settings/src/com/android/settings/accessibility/TextReadingPreviewController.java
@@ -28,7 +28,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.TextReadingPreferenceFragment.EntryPoint;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.instrumentation.SettingsStatsLog;
diff --git a/Settings/src/com/android/settings/accessibility/TextReadingPreviewPreference.java b/Settings/src/com/android/settings/accessibility/TextReadingPreviewPreference.java
index a9e2dce4..7799cbfa 100644
--- a/Settings/src/com/android/settings/accessibility/TextReadingPreviewPreference.java
+++ b/Settings/src/com/android/settings/accessibility/TextReadingPreviewPreference.java
@@ -28,7 +28,7 @@ import androidx.viewpager.widget.ViewPager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.display.PreviewPagerAdapter;
import com.android.settings.widget.DotsPageIndicator;
diff --git a/Settings/src/com/android/settings/accessibility/TextReadingResetPreference.java b/Settings/src/com/android/settings/accessibility/TextReadingResetPreference.java
index 9518de23..45f8787c 100644
--- a/Settings/src/com/android/settings/accessibility/TextReadingResetPreference.java
+++ b/Settings/src/com/android/settings/accessibility/TextReadingResetPreference.java
@@ -23,7 +23,7 @@ import android.view.View;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* The preference which is used for resetting the status of all preferences in the display size
diff --git a/Settings/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/Settings/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 0b5ad3ee..e145af25 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -45,7 +45,7 @@ import android.widget.CompoundButton;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
import com.android.settingslib.accessibility.AccessibilityUtils;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java b/Settings/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
index 6a04863f..b680839c 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceController.java b/Settings/src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceController.java
index cc93696f..d1097242 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Preference controller for accessibility autoclick footer.
diff --git a/Settings/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java b/Settings/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
index f5ce509b..40463049 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 168e99d4..2a2408b6 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index ccba9e7f..73b44a41 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -33,7 +33,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.SettingsMainSwitchPreference;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index bc34e01e..736b6758 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -35,7 +35,7 @@ import android.view.ViewGroup;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.SettingsMainSwitchPreference;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/Settings/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index e7835f83..bfd39a6e 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -54,7 +54,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleForceInvertPreferenceController.java b/Settings/src/com/android/settings/accessibility/ToggleForceInvertPreferenceController.java
index 3f2cc130..fb41955c 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleForceInvertPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleForceInvertPreferenceController.java
@@ -22,7 +22,7 @@ import android.view.accessibility.Flags;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/** A toggle preference controller for force invert (force dark). */
diff --git a/Settings/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
index 2f7005cb..9b1795e3 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
@@ -35,7 +35,7 @@ import android.view.ViewGroup;
import androidx.preference.PreferenceCategory;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.SeekBarPreference;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 023556cb..dad6c3e6 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -52,7 +52,7 @@ import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.accessibility.Flags;
import com.android.settings.DialogCreatable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/Settings/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
index 9182fbb5..c6c2bc62 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
@@ -27,7 +27,7 @@ import android.view.ViewGroup;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupdesign.GlifPreferenceLayout;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/Settings/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
index 4309b1d9..b2a4adb2 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
@@ -27,7 +27,7 @@ import android.view.ViewGroup;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupdesign.GlifPreferenceLayout;
diff --git a/Settings/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/Settings/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
index 8d26785d..ba50c428 100644
--- a/Settings/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
+++ b/Settings/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
@@ -27,7 +27,7 @@ import android.view.ViewGroup;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupdesign.GlifPreferenceLayout;
diff --git a/Settings/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java b/Settings/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java
index 7a8ba213..5d27b756 100644
--- a/Settings/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class TopLevelAccessibilityPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/Settings/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
index bc8c6005..7b73ff97 100644
--- a/Settings/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
@@ -22,7 +22,7 @@ import android.os.Vibrator;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.widget.SeekBarPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java b/Settings/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
index 41e81983..d8325d5c 100644
--- a/Settings/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
+++ b/Settings/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
@@ -28,7 +28,7 @@ import android.view.ViewGroup;
import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.Flags;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java b/Settings/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
index 02e89269..8a9186ed 100644
--- a/Settings/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
@@ -27,7 +27,7 @@ import android.os.VibrationAttributes;
import android.os.Vibrator;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/accessibility/VibrationPreferenceConfig.java b/Settings/src/com/android/settings/accessibility/VibrationPreferenceConfig.java
index a3048622..1b50c5cf 100644
--- a/Settings/src/com/android/settings/accessibility/VibrationPreferenceConfig.java
+++ b/Settings/src/com/android/settings/accessibility/VibrationPreferenceConfig.java
@@ -35,7 +35,7 @@ import android.provider.Settings;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
/**
diff --git a/Settings/src/com/android/settings/accessibility/VibrationPreferenceController.java b/Settings/src/com/android/settings/accessibility/VibrationPreferenceController.java
index d4302490..7fd6e062 100644
--- a/Settings/src/com/android/settings/accessibility/VibrationPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/VibrationPreferenceController.java
@@ -26,7 +26,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.flags.Flags;
diff --git a/Settings/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java b/Settings/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java
index 149bed35..0cdb5ed2 100644
--- a/Settings/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/accessibility/VibrationSettings.java b/Settings/src/com/android/settings/accessibility/VibrationSettings.java
index 4b36dde6..11adcefa 100644
--- a/Settings/src/com/android/settings/accessibility/VibrationSettings.java
+++ b/Settings/src/com/android/settings/accessibility/VibrationSettings.java
@@ -29,7 +29,7 @@ import android.view.ViewGroup;
import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.Flags;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/accessibility/VibrationTogglePreferenceController.java b/Settings/src/com/android/settings/accessibility/VibrationTogglePreferenceController.java
index c60158da..bb67f7bf 100644
--- a/Settings/src/com/android/settings/accessibility/VibrationTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/VibrationTogglePreferenceController.java
@@ -22,7 +22,7 @@ import android.os.Vibrator;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java b/Settings/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
index eccfbce7..e9944071 100644
--- a/Settings/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
@@ -22,7 +22,7 @@ import android.accessibilityservice.AccessibilityServiceInfo;
import android.os.Bundle;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Fragment that only allowed hardware {@link UserShortcutType} for shortcut to open.
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java b/Settings/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
index 5a3b13ab..e5d2c273 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
@@ -55,7 +55,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.accessibility.dialog.AccessibilityTarget;
import com.android.internal.accessibility.dialog.AccessibilityTargetHelper;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.accessibility.AccessibilitySetupWizardUtils;
import com.android.settings.accessibility.Flags;
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/FloatingButtonShortcutOptionController.java b/Settings/src/com/android/settings/accessibility/shortcuts/FloatingButtonShortcutOptionController.java
index e72a85d9..bab6fedb 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/FloatingButtonShortcutOptionController.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/FloatingButtonShortcutOptionController.java
@@ -23,7 +23,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil;
/**
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionController.java b/Settings/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionController.java
index fb312c66..261caa79 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionController.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionController.java
@@ -22,7 +22,7 @@ import android.text.SpannableStringBuilder;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil;
/**
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/NavButtonShortcutOptionController.java b/Settings/src/com/android/settings/accessibility/shortcuts/NavButtonShortcutOptionController.java
index 32c8da2e..241e7a5c 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/NavButtonShortcutOptionController.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/NavButtonShortcutOptionController.java
@@ -27,7 +27,7 @@ import androidx.annotation.NonNull;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil;
/**
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java b/Settings/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
index 53d84b3e..4fbcd534 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
@@ -31,7 +31,7 @@ import androidx.annotation.RawRes;
import androidx.preference.CheckBoxPreference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.LottieColorUtils;
import com.airbnb.lottie.LottieAnimationView;
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java b/Settings/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
index 24098c81..e8cf46a4 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
@@ -23,7 +23,7 @@ import android.provider.Settings;
import android.view.View;
import com.android.internal.accessibility.common.ShortcutConstants;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityButtonFragment;
import com.android.settings.accessibility.FloatingMenuSizePreferenceController;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java b/Settings/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
index 0eb1ee5a..d85e8bc1 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
@@ -26,7 +26,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.accessibility.common.ShortcutConstants;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil;
import com.android.settings.accessibility.ExpandablePreference;
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionController.java b/Settings/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionController.java
index 64ed7bdb..2dd1b5c0 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionController.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionController.java
@@ -27,7 +27,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.accessibility.common.ShortcutConstants;
import com.android.server.accessibility.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil;
import java.util.Set;
diff --git a/Settings/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java b/Settings/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
index 9083e7cc..109d9da9 100644
--- a/Settings/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
+++ b/Settings/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
@@ -22,7 +22,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.accessibility.common.ShortcutConstants;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil;
/**
diff --git a/Settings/src/com/android/settings/accounts/AccountDashboardFragment.java b/Settings/src/com/android/settings/accounts/AccountDashboardFragment.java
index 81aefd98..35eaa64d 100644
--- a/Settings/src/com/android/settings/accounts/AccountDashboardFragment.java
+++ b/Settings/src/com/android/settings/accounts/AccountDashboardFragment.java
@@ -27,7 +27,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.autofill.PasswordsPreferenceController;
import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
import com.android.settings.applications.credentials.DefaultCombinedPreferenceController;
diff --git a/Settings/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/Settings/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index 8e1d627d..505d22b3 100644
--- a/Settings/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/Settings/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -30,7 +30,7 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.accounts.AuthenticatorHelper;
diff --git a/Settings/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/Settings/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
index b466d2bb..ab1fd419 100644
--- a/Settings/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
@@ -28,7 +28,7 @@ import android.os.UserHandle;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.accounts.AuthenticatorHelper;
diff --git a/Settings/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java b/Settings/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
index cd1cd5cb..85bff7d2 100644
--- a/Settings/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
+++ b/Settings/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
@@ -24,7 +24,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.credentials.CredentialManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.autofill.PasswordsPreferenceController;
import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/accounts/AccountPreference.java b/Settings/src/com/android/settings/accounts/AccountPreference.java
index c0da387f..4fcbc3b3 100644
--- a/Settings/src/com/android/settings/accounts/AccountPreference.java
+++ b/Settings/src/com/android/settings/accounts/AccountPreference.java
@@ -25,7 +25,7 @@ import android.widget.ImageView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/accounts/AccountPreferenceController.java b/Settings/src/com/android/settings/accounts/AccountPreferenceController.java
index 2d862d6f..025f1077 100644
--- a/Settings/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -61,7 +61,7 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.settings.AccessiblePreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/accounts/AccountPrivateDashboardFragment.java b/Settings/src/com/android/settings/accounts/AccountPrivateDashboardFragment.java
index 9794b4ae..bf439288 100644
--- a/Settings/src/com/android/settings/accounts/AccountPrivateDashboardFragment.java
+++ b/Settings/src/com/android/settings/accounts/AccountPrivateDashboardFragment.java
@@ -24,7 +24,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.credentials.CredentialManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.autofill.PasswordsPreferenceController;
import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/Settings/src/com/android/settings/accounts/AccountSyncPreferenceController.java
index 5a00d195..99c7a5ab 100644
--- a/Settings/src/com/android/settings/accounts/AccountSyncPreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/AccountSyncPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.accounts.AuthenticatorHelper;
diff --git a/Settings/src/com/android/settings/accounts/AccountSyncSettings.java b/Settings/src/com/android/settings/accounts/AccountSyncSettings.java
index 80056a87..fc3d6707 100644
--- a/Settings/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/Settings/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -50,7 +50,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/Settings/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
index 3b254e9b..7433eb53 100644
--- a/Settings/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
+++ b/Settings/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
@@ -43,7 +43,7 @@ import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.location.LocationSettings;
import com.android.settings.utils.LocalClassLoaderContextThemeWrapper;
diff --git a/Settings/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java b/Settings/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
index f0da2fb3..91ce3f40 100644
--- a/Settings/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
+++ b/Settings/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
@@ -24,7 +24,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.credentials.CredentialManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.autofill.PasswordsPreferenceController;
import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/accounts/AddAccountSettings.java b/Settings/src/com/android/settings/accounts/AddAccountSettings.java
index 85e942b1..54683410 100644
--- a/Settings/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/Settings/src/com/android/settings/accounts/AddAccountSettings.java
@@ -34,7 +34,7 @@ import android.os.UserManager;
import android.util.Log;
import android.widget.Toast;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.password.ChooseLockSettingsHelper;
diff --git a/Settings/src/com/android/settings/accounts/AvatarViewMixin.java b/Settings/src/com/android/settings/accounts/AvatarViewMixin.java
index 0925e24e..b54d4642 100644
--- a/Settings/src/com/android/settings/accounts/AvatarViewMixin.java
+++ b/Settings/src/com/android/settings/accounts/AvatarViewMixin.java
@@ -36,7 +36,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.OnLifecycleEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/accounts/ChooseAccountFragment.java b/Settings/src/com/android/settings/accounts/ChooseAccountFragment.java
index 8f3318e3..db22f141 100644
--- a/Settings/src/com/android/settings/accounts/ChooseAccountFragment.java
+++ b/Settings/src/com/android/settings/accounts/ChooseAccountFragment.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/accounts/ContactSearchPreferenceController.java b/Settings/src/com/android/settings/accounts/ContactSearchPreferenceController.java
index 87dabd8d..c10c26bb 100644
--- a/Settings/src/com/android/settings/accounts/ContactSearchPreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/ContactSearchPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceData;
diff --git a/Settings/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java b/Settings/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java
index d3650018..e88c4269 100644
--- a/Settings/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java
@@ -25,7 +25,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
diff --git a/Settings/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/Settings/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
index 790ce7f7..aa5cb5c8 100644
--- a/Settings/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
@@ -27,7 +27,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.search.SearchIndexableRaw;
@@ -47,8 +47,8 @@ public class EmergencyInfoPreferenceController extends BasePreferenceController
if (isAvailable()) {
SearchIndexableRaw data = new SearchIndexableRaw(mContext);
final Resources res = mContext.getResources();
- data.title = res.getString(com.android.settings.R.string.emergency_info_title);
- data.screenTitle = res.getString(com.android.settings.R.string.emergency_info_title);
+ data.title = res.getString(R.string.emergency_info_title);
+ data.screenTitle = res.getString(R.string.emergency_info_title);
rawData.add(data);
}
}
diff --git a/Settings/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java b/Settings/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
index f7816bb3..d52f0636 100644
--- a/Settings/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
@@ -23,7 +23,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/accounts/ManagedProfileSettings.java b/Settings/src/com/android/settings/accounts/ManagedProfileSettings.java
index e5292621..13488148 100644
--- a/Settings/src/com/android/settings/accounts/ManagedProfileSettings.java
+++ b/Settings/src/com/android/settings/accounts/ManagedProfileSettings.java
@@ -34,7 +34,7 @@ import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/Settings/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index cdb35b42..d7006ea3 100644
--- a/Settings/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -40,7 +40,7 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/Settings/src/com/android/settings/accounts/SyncStateSwitchPreference.java
index 2f92d563..644d4cba 100644
--- a/Settings/src/com/android/settings/accounts/SyncStateSwitchPreference.java
+++ b/Settings/src/com/android/settings/accounts/SyncStateSwitchPreference.java
@@ -28,7 +28,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreferenceCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.AnimatedImageView;
public class SyncStateSwitchPreference extends SwitchPreferenceCompat {
diff --git a/Settings/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java b/Settings/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
index 152bb673..409ab822 100644
--- a/Settings/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.accounts;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class TopLevelAccountEntryPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/accounts/WorkModePreferenceController.java b/Settings/src/com/android/settings/accounts/WorkModePreferenceController.java
index 2aea27da..f771c55d 100644
--- a/Settings/src/com/android/settings/accounts/WorkModePreferenceController.java
+++ b/Settings/src/com/android/settings/accounts/WorkModePreferenceController.java
@@ -24,7 +24,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.SliceData;
import com.android.settingslib.widget.MainSwitchPreference;
diff --git a/Settings/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/Settings/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index 4e39070f..0c4bff75 100644
--- a/Settings/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/Settings/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -34,7 +34,7 @@ import androidx.window.embedding.SplitPairRule;
import androidx.window.embedding.SplitPlaceholderRule;
import androidx.window.embedding.SplitRule;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
diff --git a/Settings/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java b/Settings/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java
index b91e0e5e..cdc7b98f 100644
--- a/Settings/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java
+++ b/Settings/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java
@@ -27,7 +27,7 @@ import android.util.TypedValue;
import androidx.window.embedding.ActivityEmbeddingController;
import androidx.window.embedding.SplitController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.util.WizardManagerHelper;
diff --git a/Settings/src/com/android/settings/applications/AppBatteryUsagePreferenceController.java b/Settings/src/com/android/settings/applications/AppBatteryUsagePreferenceController.java
index 59e409b7..af95ded0 100644
--- a/Settings/src/com/android/settings/applications/AppBatteryUsagePreferenceController.java
+++ b/Settings/src/com/android/settings/applications/AppBatteryUsagePreferenceController.java
@@ -27,7 +27,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.google.common.annotations.VisibleForTesting;
diff --git a/Settings/src/com/android/settings/applications/AppDashboardFragment.java b/Settings/src/com/android/settings/applications/AppDashboardFragment.java
index 41160d82..21eb5084 100644
--- a/Settings/src/com/android/settings/applications/AppDashboardFragment.java
+++ b/Settings/src/com/android/settings/applications/AppDashboardFragment.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/applications/AppDomainsPreference.java b/Settings/src/com/android/settings/applications/AppDomainsPreference.java
index 684a0b72..bd361c62 100644
--- a/Settings/src/com/android/settings/applications/AppDomainsPreference.java
+++ b/Settings/src/com/android/settings/applications/AppDomainsPreference.java
@@ -21,7 +21,7 @@ import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.ListDialogPreference;
public class AppDomainsPreference extends ListDialogPreference {
diff --git a/Settings/src/com/android/settings/applications/AppLocaleUtil.java b/Settings/src/com/android/settings/applications/AppLocaleUtil.java
index 103a2c10..9ddb26d1 100644
--- a/Settings/src/com/android/settings/applications/AppLocaleUtil.java
+++ b/Settings/src/com/android/settings/applications/AppLocaleUtil.java
@@ -30,7 +30,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/applications/AppStateNotificationBridge.java b/Settings/src/com/android/settings/applications/AppStateNotificationBridge.java
index f0e447e1..8848cd7b 100644
--- a/Settings/src/com/android/settings/applications/AppStateNotificationBridge.java
+++ b/Settings/src/com/android/settings/applications/AppStateNotificationBridge.java
@@ -26,7 +26,7 @@ import android.util.ArrayMap;
import android.util.Log;
import android.widget.CompoundButton;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/settings/applications/AppStorageSettings.java b/Settings/src/com/android/settings/applications/AppStorageSettings.java
index e45657fc..94cbd07c 100644
--- a/Settings/src/com/android/settings/applications/AppStorageSettings.java
+++ b/Settings/src/com/android/settings/applications/AppStorageSettings.java
@@ -50,7 +50,7 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
import com.android.settings.fuelgauge.datasaver.DynamicDenylistManager;
diff --git a/Settings/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/Settings/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 851d763e..6d960092 100644
--- a/Settings/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/Settings/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -43,7 +43,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.telephony.SmsApplication;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/applications/AppsPreferenceController.java b/Settings/src/com/android/settings/applications/AppsPreferenceController.java
index 96337666..6bc7bdb5 100644
--- a/Settings/src/com/android/settings/applications/AppsPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/AppsPreferenceController.java
@@ -34,7 +34,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.Utils;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/settings/applications/ClearDefaultsPreference.java b/Settings/src/com/android/settings/applications/ClearDefaultsPreference.java
index 0952b9c8..6b71e08e 100644
--- a/Settings/src/com/android/settings/applications/ClearDefaultsPreference.java
+++ b/Settings/src/com/android/settings/applications/ClearDefaultsPreference.java
@@ -38,7 +38,7 @@ import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.applications.AppUtils;
diff --git a/Settings/src/com/android/settings/applications/ClonedAppsPreferenceController.java b/Settings/src/com/android/settings/applications/ClonedAppsPreferenceController.java
index d134cecc..9ff6a05c 100644
--- a/Settings/src/com/android/settings/applications/ClonedAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/ClonedAppsPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
diff --git a/Settings/src/com/android/settings/applications/HibernatedAppsPreferenceController.java b/Settings/src/com/android/settings/applications/HibernatedAppsPreferenceController.java
index eb6edb27..541f0cd3 100644
--- a/Settings/src/com/android/settings/applications/HibernatedAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/HibernatedAppsPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.google.common.annotations.VisibleForTesting;
diff --git a/Settings/src/com/android/settings/applications/OpenSupportedLinks.java b/Settings/src/com/android/settings/applications/OpenSupportedLinks.java
index 2606a6cb..d622affe 100644
--- a/Settings/src/com/android/settings/applications/OpenSupportedLinks.java
+++ b/Settings/src/com/android/settings/applications/OpenSupportedLinks.java
@@ -31,7 +31,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/applications/ProcStatsData.java b/Settings/src/com/android/settings/applications/ProcStatsData.java
index aedb0664..15ba7d8b 100644
--- a/Settings/src/com/android/settings/applications/ProcStatsData.java
+++ b/Settings/src/com/android/settings/applications/ProcStatsData.java
@@ -40,7 +40,7 @@ import com.android.internal.app.procstats.ProcessStats.ProcessDataCollection;
import com.android.internal.app.procstats.ProcessStats.TotalMemoryUseCollection;
import com.android.internal.app.procstats.ServiceState;
import com.android.internal.util.MemInfoReader;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import java.io.IOException;
diff --git a/Settings/src/com/android/settings/applications/ProcStatsPackageEntry.java b/Settings/src/com/android/settings/applications/ProcStatsPackageEntry.java
index 0c4f9be8..54b9c64a 100644
--- a/Settings/src/com/android/settings/applications/ProcStatsPackageEntry.java
+++ b/Settings/src/com/android/settings/applications/ProcStatsPackageEntry.java
@@ -23,7 +23,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/applications/ProcessStatsBase.java b/Settings/src/com/android/settings/applications/ProcessStatsBase.java
index ce1453ff..f1fc6ecb 100644
--- a/Settings/src/com/android/settings/applications/ProcessStatsBase.java
+++ b/Settings/src/com/android/settings/applications/ProcessStatsBase.java
@@ -24,7 +24,7 @@ import android.widget.ArrayAdapter;
import android.widget.Spinner;
import com.android.internal.app.procstats.ProcessStats;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ProcStatsData.MemInfo;
diff --git a/Settings/src/com/android/settings/applications/ProcessStatsDetail.java b/Settings/src/com/android/settings/applications/ProcessStatsDetail.java
index de21a46a..d3269411 100644
--- a/Settings/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/Settings/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -50,7 +50,7 @@ import androidx.preference.PreferenceCategory;
import com.android.settings.CancellablePreference;
import com.android.settings.CancellablePreference.OnCancelListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.SummaryPreference;
import com.android.settings.applications.ProcStatsEntry.Service;
diff --git a/Settings/src/com/android/settings/applications/ProcessStatsSummary.java b/Settings/src/com/android/settings/applications/ProcessStatsSummary.java
index ef76cd58..1e1224ab 100644
--- a/Settings/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/Settings/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceCategory;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SummaryPreference;
import com.android.settings.Utils;
import com.android.settings.applications.ProcStatsData.MemInfo;
diff --git a/Settings/src/com/android/settings/applications/ProcessStatsUi.java b/Settings/src/com/android/settings/applications/ProcessStatsUi.java
index ab334a8d..45c90368 100644
--- a/Settings/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/Settings/src/com/android/settings/applications/ProcessStatsUi.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import com.android.internal.app.procstats.ProcessStats;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.ProcStatsData.MemInfo;
diff --git a/Settings/src/com/android/settings/applications/RunningProcessesView.java b/Settings/src/com/android/settings/applications/RunningProcessesView.java
index 5198a4ac..ad939411 100644
--- a/Settings/src/com/android/settings/applications/RunningProcessesView.java
+++ b/Settings/src/com/android/settings/applications/RunningProcessesView.java
@@ -42,7 +42,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.internal.util.MemInfoReader;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/applications/RunningServiceDetails.java b/Settings/src/com/android/settings/applications/RunningServiceDetails.java
index 3d5bddb4..03587909 100644
--- a/Settings/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/Settings/src/com/android/settings/applications/RunningServiceDetails.java
@@ -33,7 +33,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/applications/RunningServices.java b/Settings/src/com/android/settings/applications/RunningServices.java
index c75fe069..c001e91d 100644
--- a/Settings/src/com/android/settings/applications/RunningServices.java
+++ b/Settings/src/com/android/settings/applications/RunningServices.java
@@ -24,7 +24,7 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.LoadingViewController;
diff --git a/Settings/src/com/android/settings/applications/RunningState.java b/Settings/src/com/android/settings/applications/RunningState.java
index 5429b053..d31f2d34 100644
--- a/Settings/src/com/android/settings/applications/RunningState.java
+++ b/Settings/src/com/android/settings/applications/RunningState.java
@@ -43,7 +43,7 @@ import android.text.format.Formatter;
import android.util.Log;
import android.util.SparseArray;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.applications.InterestingConfigChanges;
diff --git a/Settings/src/com/android/settings/applications/SpacePreference.java b/Settings/src/com/android/settings/applications/SpacePreference.java
index 6575ad1d..8cf9a210 100644
--- a/Settings/src/com/android/settings/applications/SpacePreference.java
+++ b/Settings/src/com/android/settings/applications/SpacePreference.java
@@ -24,7 +24,7 @@ import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A blank preference that has a specified height by android:layout_height. It can be used
diff --git a/Settings/src/com/android/settings/applications/UsageAccessDetails.java b/Settings/src/com/android/settings/applications/UsageAccessDetails.java
index e111942f..6a7fbad4 100644
--- a/Settings/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/Settings/src/com/android/settings/applications/UsageAccessDetails.java
@@ -39,7 +39,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.Preference.OnPreferenceClickListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppStateUsageBridge.UsageState;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java b/Settings/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
index b47b679a..01df324a 100644
--- a/Settings/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
+++ b/Settings/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
@@ -24,7 +24,7 @@ import android.view.View;
import androidx.preference.CheckBoxPreference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Radio button preference with image at the bottom.
diff --git a/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java b/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
index 42114243..f20602bb 100644
--- a/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
@@ -21,7 +21,7 @@ import android.os.Build;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
index ef054dfa..0984db0d 100644
--- a/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
+++ b/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
@@ -43,7 +43,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java b/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
index 3bf61099..ede62ffb 100644
--- a/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
+++ b/Settings/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
@@ -48,7 +48,7 @@ import android.util.ArrayMap;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.window.flags.Flags;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java b/Settings/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java
index 648696ba..4a66ad4c 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java
@@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
index 35fc1cb1..b52d3241 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
index b80de32c..eefb7c64 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
@@ -49,7 +49,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.ApplicationFeatureProvider;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
index baa1dafa..47d8f59c 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
@@ -29,7 +29,7 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.datausage.AppDataUsage;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
index 55420876..c65c412a 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
@@ -22,7 +22,7 @@ import android.content.pm.PackageInfo;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.applications.AppUtils;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/Settings/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 90d733e6..cd3b4474 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -53,7 +53,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.manageapplications.ManageApplications;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java
index 1216ae8c..bd2b5cc7 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Intent;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppStoreUtil;
import com.android.settingslib.applications.AppUtils;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppLocaleDetails.java b/Settings/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
index 1e7ca1e5..bc190c5d 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
import androidx.preference.Preference;
import com.android.internal.app.LocaleHelper;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
index 19e8ebbb..21357e9c 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
@@ -25,7 +25,7 @@ import android.text.format.Formatter;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.ProcStatsData;
import com.android.settings.applications.ProcStatsEntry;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
index 6698fca2..b1e4e114 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
@@ -25,7 +25,7 @@ import android.os.Bundle;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.AppNotificationSettings;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java
index cbaf75f5..a4c37969 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java
@@ -27,7 +27,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.intentpicker.AppLaunchSettings;
import com.android.settings.applications.intentpicker.IntentPickerUtils;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
index b7069d9d..ddb03c02 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
@@ -29,7 +29,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.applications.PermissionsSummaryHelper;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java
index 490fa0e8..66a5dbc9 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java
@@ -28,7 +28,7 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppStorageSettings;
import com.android.settings.applications.FetchPackageStorageAsyncLoader;
diff --git a/Settings/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java
index 23dd9602..50a939df 100644
--- a/Settings/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.content.pm.PackageInfo;
import android.text.BidiFormatter;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class AppVersionPreferenceController extends AppInfoPreferenceControllerBase {
diff --git a/Settings/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java b/Settings/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java
index 5a466f50..6a8263a8 100644
--- a/Settings/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java
+++ b/Settings/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java
@@ -25,7 +25,7 @@ import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.lang.annotation.Retention;
diff --git a/Settings/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/Settings/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index 5a1883b3..6e291c03 100644
--- a/Settings/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/Settings/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -24,7 +24,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.util.CollectionUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.concurrent.Executor;
diff --git a/Settings/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/Settings/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java
index 409b695f..6a29f772 100644
--- a/Settings/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java
@@ -31,7 +31,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
diff --git a/Settings/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/Settings/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
index 9a41f251..1b343693 100644
--- a/Settings/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
@@ -29,7 +29,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateInstallAppsBridge;
diff --git a/Settings/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java b/Settings/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java
index f514ed67..4157611e 100644
--- a/Settings/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java
+++ b/Settings/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java
@@ -25,7 +25,7 @@ import android.os.UserHandle;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java b/Settings/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java
index 21e641d7..50070e30 100644
--- a/Settings/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java
@@ -32,7 +32,7 @@ import android.widget.Button;
import androidx.fragment.app.DialogFragment;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppStoreUtil;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.applications.AppUtils;
diff --git a/Settings/src/com/android/settings/applications/appinfo/LongBackgroundTasksDetails.java b/Settings/src/com/android/settings/applications/appinfo/LongBackgroundTasksDetails.java
index 5ee4c825..bd1b21c0 100644
--- a/Settings/src/com/android/settings/applications/appinfo/LongBackgroundTasksDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/LongBackgroundTasksDetails.java
@@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateLongBackgroundTasksBridge;
diff --git a/Settings/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java b/Settings/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java
index e7eff9fc..4e402a04 100644
--- a/Settings/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java
@@ -29,7 +29,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateManageExternalStorageBridge;
diff --git a/Settings/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java b/Settings/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java
index 71b494b7..23cb0643 100644
--- a/Settings/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java
@@ -25,7 +25,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateMediaManagementAppsBridge;
diff --git a/Settings/src/com/android/settings/applications/appinfo/TurnScreenOnDetails.java b/Settings/src/com/android/settings/applications/appinfo/TurnScreenOnDetails.java
index 95694db5..f8561819 100644
--- a/Settings/src/com/android/settings/applications/appinfo/TurnScreenOnDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/TurnScreenOnDetails.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge;
diff --git a/Settings/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/Settings/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java
index 94ebc41f..3bdb4f1a 100644
--- a/Settings/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java
+++ b/Settings/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java
@@ -26,7 +26,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateWriteSettingsBridge;
diff --git a/Settings/src/com/android/settings/applications/appops/AppOpsCategory.java b/Settings/src/com/android/settings/applications/appops/AppOpsCategory.java
index 95ee256a..b57bbef2 100644
--- a/Settings/src/com/android/settings/applications/appops/AppOpsCategory.java
+++ b/Settings/src/com/android/settings/applications/appops/AppOpsCategory.java
@@ -39,7 +39,7 @@ import androidx.loader.app.LoaderManager;
import androidx.loader.content.AsyncTaskLoader;
import androidx.loader.content.Loader;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.appops.AppOpsState.AppOpEntry;
import java.util.List;
diff --git a/Settings/src/com/android/settings/applications/appops/AppOpsState.java b/Settings/src/com/android/settings/applications/appops/AppOpsState.java
index eab3dda0..86a6c823 100644
--- a/Settings/src/com/android/settings/applications/appops/AppOpsState.java
+++ b/Settings/src/com/android/settings/applications/appops/AppOpsState.java
@@ -30,7 +30,7 @@ import android.text.format.DateUtils;
import android.util.Log;
import android.util.SparseArray;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.io.File;
import java.text.Collator;
diff --git a/Settings/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/Settings/src/com/android/settings/applications/appops/BackgroundCheckSummary.java
index 4ed9002d..40d05433 100644
--- a/Settings/src/com/android/settings/applications/appops/BackgroundCheckSummary.java
+++ b/Settings/src/com/android/settings/applications/appops/BackgroundCheckSummary.java
@@ -26,7 +26,7 @@ import android.view.ViewGroup;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentTransaction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
public class BackgroundCheckSummary extends InstrumentedPreferenceFragment {
diff --git a/Settings/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/Settings/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
index b2e36445..4f26ba66 100644
--- a/Settings/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.app.AssistUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
import com.android.settingslib.applications.DefaultAppInfo;
diff --git a/Settings/src/com/android/settings/applications/assist/ManageAssist.java b/Settings/src/com/android/settings/applications/assist/ManageAssist.java
index 28c7d96e..0b07515b 100644
--- a/Settings/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/Settings/src/com/android/settings/applications/assist/ManageAssist.java
@@ -19,7 +19,7 @@ package com.android.settings.applications.assist;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/applications/autofill/AutofillPickerActivity.java b/Settings/src/com/android/settings/applications/autofill/AutofillPickerActivity.java
index e6180da9..6fc73ddd 100644
--- a/Settings/src/com/android/settings/applications/autofill/AutofillPickerActivity.java
+++ b/Settings/src/com/android/settings/applications/autofill/AutofillPickerActivity.java
@@ -16,7 +16,7 @@ package com.android.settings.applications.autofill;
import android.content.Intent;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.credentials.DefaultCombinedPicker;
diff --git a/Settings/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java b/Settings/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
index 73fef1bc..818e1062 100644
--- a/Settings/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
@@ -53,7 +53,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.os.IResultReceiver;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java b/Settings/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
index e16219b7..39b10911 100644
--- a/Settings/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
@@ -65,7 +65,7 @@ import androidx.preference.PreferenceViewHolder;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.content.PackageMonitor;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java b/Settings/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
index d6f5289e..abef91c0 100644
--- a/Settings/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
+++ b/Settings/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
@@ -43,7 +43,7 @@ import androidx.core.content.ContextCompat;
import androidx.preference.Preference;
import com.android.internal.content.PackageMonitor;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java b/Settings/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
index 032402fb..0d1e3131 100644
--- a/Settings/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
import com.android.settingslib.applications.DefaultAppInfo;
diff --git a/Settings/src/com/android/settings/applications/credentials/PrimaryProviderPreference.java b/Settings/src/com/android/settings/applications/credentials/PrimaryProviderPreference.java
index 84459e05..42b558e7 100644
--- a/Settings/src/com/android/settings/applications/credentials/PrimaryProviderPreference.java
+++ b/Settings/src/com/android/settings/applications/credentials/PrimaryProviderPreference.java
@@ -28,7 +28,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.GearPreference;
/**
diff --git a/Settings/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/Settings/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index fda6b281..94fa6e03 100644
--- a/Settings/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/Settings/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -29,7 +29,7 @@ import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.widget.RadioButtonPickerFragment;
diff --git a/Settings/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/Settings/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
index c31fb9e5..b50c7acf 100644
--- a/Settings/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
@@ -30,7 +30,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.GearPreference;
diff --git a/Settings/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/Settings/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index d96aa6be..78838977 100644
--- a/Settings/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/Settings/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
@@ -39,7 +39,7 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.internal.content.PackageMonitor;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java b/Settings/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
index 676c35a3..26b8b963 100644
--- a/Settings/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
+++ b/Settings/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
@@ -44,7 +44,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.ClearDefaultsPreference;
diff --git a/Settings/src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java b/Settings/src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java
index 6c597455..b3fe202f 100644
--- a/Settings/src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java
+++ b/Settings/src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java
@@ -38,7 +38,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.utils.ThreadUtils;
diff --git a/Settings/src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java b/Settings/src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java
index f8f9a71b..9fb01434 100644
--- a/Settings/src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java
+++ b/Settings/src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java
@@ -21,7 +21,7 @@ import android.content.pm.verify.domain.DomainOwner;
import android.text.TextUtils;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
import java.util.SortedSet;
diff --git a/Settings/src/com/android/settings/applications/intentpicker/SupportedLinksAdapter.java b/Settings/src/com/android/settings/applications/intentpicker/SupportedLinksAdapter.java
index 07169718..da9b1621 100644
--- a/Settings/src/com/android/settings/applications/intentpicker/SupportedLinksAdapter.java
+++ b/Settings/src/com/android/settings/applications/intentpicker/SupportedLinksAdapter.java
@@ -25,7 +25,7 @@ import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.CheckedTextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java b/Settings/src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java
index cc1241d8..628dac96 100644
--- a/Settings/src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java
+++ b/Settings/src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java
@@ -32,7 +32,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.util.HashMap;
diff --git a/Settings/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/Settings/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index fd998f57..11c10762 100644
--- a/Settings/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/Settings/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -18,7 +18,7 @@ package com.android.settings.applications.manageapplications;
import androidx.annotation.IntDef;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
import com.android.settings.applications.AppStateAppBatteryUsageBridge;
import com.android.settings.applications.AppStateClonedAppsBridge;
diff --git a/Settings/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/Settings/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
index cd3fd6bd..2dfab94b 100644
--- a/Settings/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
+++ b/Settings/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -41,7 +41,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
diff --git a/Settings/src/com/android/settings/applications/manageapplications/ManageApplications.java b/Settings/src/com/android/settings/applications/manageapplications/ManageApplications.java
index c2fabff6..55de672f 100644
--- a/Settings/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/Settings/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -93,7 +93,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.compat.IPlatformCompat;
import com.android.internal.jank.InteractionJankMonitor;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings.AlarmsAndRemindersActivity;
import com.android.settings.Settings.AppBatteryUsageActivity;
import com.android.settings.Settings.ChangeNfcTagAppsActivity;
diff --git a/Settings/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java b/Settings/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
index b2b7512d..ee6e057c 100644
--- a/Settings/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
+++ b/Settings/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
@@ -37,7 +37,7 @@ import android.util.Log;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryOptimizeUtils;
import com.android.settings.fuelgauge.datasaver.DynamicDenylistManager;
diff --git a/Settings/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java b/Settings/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
index f80245c2..77d79285 100644
--- a/Settings/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
+++ b/Settings/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
@@ -23,7 +23,7 @@ import android.graphics.drawable.Drawable;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.intentpicker.IntentPickerUtils;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
diff --git a/Settings/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java b/Settings/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
index 33cc6d58..e3821265 100644
--- a/Settings/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.intentpicker.AppLaunchSettings;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java b/Settings/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java
index 1d395ee3..26b3065b 100644
--- a/Settings/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.applications.managedomainurls;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class InstantAppWebActionPreferenceController extends TogglePreferenceController {
diff --git a/Settings/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java b/Settings/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java
index bf37c700..2670fe84 100644
--- a/Settings/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java
+++ b/Settings/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java
@@ -21,7 +21,7 @@ import static com.android.settingslib.search.SearchIndexable.MOBILE;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.applications.AppIconCacheManager;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/DataSaverController.kt b/Settings/src/com/android/settings/applications/specialaccess/DataSaverController.kt
index baed0aa5..efd108ca 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/DataSaverController.kt
+++ b/Settings/src/com/android/settings/applications/specialaccess/DataSaverController.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settingslib.spa.framework.util.formatString
import com.android.settingslib.spaprivileged.model.app.AppListRepository
diff --git a/Settings/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java b/Settings/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
index b95da807..fc99124e 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
@@ -23,7 +23,7 @@ import android.os.UserHandle;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.nfc.BaseNfcEnabler;
/**
diff --git a/Settings/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java b/Settings/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java
index 2cbc3042..20d1a2ca 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java
@@ -22,7 +22,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGE_DE
import android.app.settings.SettingsEnums;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/Settings/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index bb9876bd..56df3029 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -79,7 +79,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.android.settings.EventLogTags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.users.UserDialogs;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java b/Settings/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
index 2258bf17..065e34dc 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
@@ -22,7 +22,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.NO_DEVICE
import android.app.settings.SettingsEnums;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesController.java b/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesController.java
index 4d49a225..a8317d84 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesController.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesController.java
@@ -23,7 +23,7 @@ import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java b/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
index faa1b510..2c9a3008 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
@@ -60,7 +60,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.AppStoreUtil;
import com.android.settings.widget.CardPreference;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java b/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java
index 432b4238..75de4d6f 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java
@@ -36,7 +36,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.EmptyTextSettings;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsSettings.java b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsSettings.java
index 21497eb7..f6a9cbad 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsSettings.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsSettings.java
@@ -29,7 +29,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/FriendlyWarningDialogFragment.java b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/FriendlyWarningDialogFragment.java
index 3577946e..b3bc116f 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/FriendlyWarningDialogFragment.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/FriendlyWarningDialogFragment.java
@@ -24,7 +24,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class FriendlyWarningDialogFragment extends InstrumentedDialogFragment {
diff --git a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
index b6362646..7cc12764 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
@@ -27,7 +27,7 @@ import android.view.View;
import androidx.lifecycle.LifecycleObserver;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
index e885d5c3..9b722b40 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
@@ -46,7 +46,7 @@ import android.util.Slog;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.bluetooth.Utils;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/ScaryWarningDialogFragment.java b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/ScaryWarningDialogFragment.java
index 747a1251..7345e896 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/ScaryWarningDialogFragment.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/notificationaccess/ScaryWarningDialogFragment.java
@@ -31,7 +31,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java b/Settings/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java
index d166b82f..7d5ab4f1 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/Settings/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
index f19b68a6..79149e0a 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
@@ -37,7 +37,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
index 2a5f1dbc..043a81f2 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppStateBaseBridge.Callback;
import com.android.settings.applications.AppStateSmsPremBridge;
import com.android.settings.applications.AppStateSmsPremBridge.SmsState;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsController.java b/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsController.java
index 9c6ab8ca..704026a8 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsController.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsController.java
@@ -18,7 +18,7 @@ package com.android.settings.applications.specialaccess.premiumsms;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class PremiumSmsController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceController.java b/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceController.java
index 582e75ea..a4ae82b3 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.applications.specialaccess.premiumsms;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class PremiumSmsScreenPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersController.java b/Settings/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersController.java
index adefec81..e1614687 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersController.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersController.java
@@ -19,7 +19,7 @@ package com.android.settings.applications.specialaccess.vrlistener;
import android.app.ActivityManager;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class EnabledVrListenersController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceController.java b/Settings/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceController.java
index 655db878..c2403d06 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceController.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.applications.specialaccess.vrlistener;
import android.app.ActivityManager;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class VrListenerScreenPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java b/Settings/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
index d35a4927..9f6a7a09 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
@@ -22,7 +22,7 @@ import android.service.vr.VrListenerService;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.utils.ManagedServiceSettings;
diff --git a/Settings/src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java b/Settings/src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java
index 5da2990c..342525aa 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java b/Settings/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java
index e4ef48bc..c7efea87 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java b/Settings/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
index ffe13e6f..bfa5fddd 100644
--- a/Settings/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
+++ b/Settings/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import java.util.Set;
diff --git a/Settings/src/com/android/settings/backup/AutoRestorePreferenceController.java b/Settings/src/com/android/settings/backup/AutoRestorePreferenceController.java
index 1394ce13..a165dc45 100644
--- a/Settings/src/com/android/settings/backup/AutoRestorePreferenceController.java
+++ b/Settings/src/com/android/settings/backup/AutoRestorePreferenceController.java
@@ -27,7 +27,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class AutoRestorePreferenceController extends TogglePreferenceController {
diff --git a/Settings/src/com/android/settings/backup/BackupDataPreferenceController.java b/Settings/src/com/android/settings/backup/BackupDataPreferenceController.java
index 25ef58c6..09283ea0 100644
--- a/Settings/src/com/android/settings/backup/BackupDataPreferenceController.java
+++ b/Settings/src/com/android/settings/backup/BackupDataPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class BackupDataPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/backup/BackupSettingsFragment.java b/Settings/src/com/android/settings/backup/BackupSettingsFragment.java
index 7df19f54..61b1ca3b 100644
--- a/Settings/src/com/android/settings/backup/BackupSettingsFragment.java
+++ b/Settings/src/com/android/settings/backup/BackupSettingsFragment.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
diff --git a/Settings/src/com/android/settings/backup/BackupSettingsHelper.java b/Settings/src/com/android/settings/backup/BackupSettingsHelper.java
index 258f54dc..b8cc5591 100644
--- a/Settings/src/com/android/settings/backup/BackupSettingsHelper.java
+++ b/Settings/src/com/android/settings/backup/BackupSettingsHelper.java
@@ -29,7 +29,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings.PrivacySettingsActivity;
import java.net.URISyntaxException;
diff --git a/Settings/src/com/android/settings/backup/ConfigureAccountPreferenceController.java b/Settings/src/com/android/settings/backup/ConfigureAccountPreferenceController.java
index 553edc25..fd4d5d6f 100644
--- a/Settings/src/com/android/settings/backup/ConfigureAccountPreferenceController.java
+++ b/Settings/src/com/android/settings/backup/ConfigureAccountPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Intent;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class ConfigureAccountPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/backup/PrivacySettings.java b/Settings/src/com/android/settings/backup/PrivacySettings.java
index 3ed2f554..4d7070b1 100644
--- a/Settings/src/com/android/settings/backup/PrivacySettings.java
+++ b/Settings/src/com/android/settings/backup/PrivacySettings.java
@@ -19,7 +19,7 @@ package com.android.settings.backup;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/Settings/src/com/android/settings/backup/ToggleBackupSettingFragment.java
index c3ad92fe..f259e0b5 100644
--- a/Settings/src/com/android/settings/backup/ToggleBackupSettingFragment.java
+++ b/Settings/src/com/android/settings/backup/ToggleBackupSettingFragment.java
@@ -18,7 +18,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SettingsMainSwitchBar;
diff --git a/Settings/src/com/android/settings/backup/UserBackupSettingsActivity.java b/Settings/src/com/android/settings/backup/UserBackupSettingsActivity.java
index e6d313c6..3b088ef5 100644
--- a/Settings/src/com/android/settings/backup/UserBackupSettingsActivity.java
+++ b/Settings/src/com/android/settings/backup/UserBackupSettingsActivity.java
@@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/Settings/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index 73e1af1b..2b362a11 100644
--- a/Settings/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/Settings/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -49,7 +49,7 @@ import androidx.annotation.Nullable;
import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.core.InstrumentedActivity;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/biometrics/BiometricEnrollBase.java b/Settings/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 335d0b9d..7c3e4fb1 100644
--- a/Settings/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/Settings/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -33,7 +33,7 @@ import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;
diff --git a/Settings/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/Settings/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index 1b9a70f5..005ed9a3 100644
--- a/Settings/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/Settings/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -34,7 +34,7 @@ import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
diff --git a/Settings/src/com/android/settings/biometrics/BiometricHandoffActivity.java b/Settings/src/com/android/settings/biometrics/BiometricHandoffActivity.java
index 263bab16..7011f78b 100644
--- a/Settings/src/com/android/settings/biometrics/BiometricHandoffActivity.java
+++ b/Settings/src/com/android/settings/biometrics/BiometricHandoffActivity.java
@@ -23,7 +23,7 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
diff --git a/Settings/src/com/android/settings/biometrics/BiometricSettingsProvider.kt b/Settings/src/com/android/settings/biometrics/BiometricSettingsProvider.kt
index 308f2450..422b6c0e 100644
--- a/Settings/src/com/android/settings/biometrics/BiometricSettingsProvider.kt
+++ b/Settings/src/com/android/settings/biometrics/BiometricSettingsProvider.kt
@@ -69,7 +69,7 @@ class BiometricSettingsProvider : ContentProvider() {
val faceEnabled =
requireContext()
.resources
- .getBoolean(com.android.settings.R.bool.config_suw_support_face_enroll)
+ .getBoolean(com.cariad.cea.settings.R.bool.config_suw_support_face_enroll)
bundle.putBoolean(SUW_FACE_ENABLED, faceEnabled)
}
}
diff --git a/Settings/src/com/android/settings/biometrics/BiometricUtils.java b/Settings/src/com/android/settings/biometrics/BiometricUtils.java
index 3376d86c..1ea8e399 100644
--- a/Settings/src/com/android/settings/biometrics/BiometricUtils.java
+++ b/Settings/src/com/android/settings/biometrics/BiometricUtils.java
@@ -43,7 +43,7 @@ import androidx.fragment.app.FragmentActivity;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.VerifyCredentialResponse;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.face.FaceEnrollIntroduction;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
diff --git a/Settings/src/com/android/settings/biometrics/BiometricsSplitScreenDialog.java b/Settings/src/com/android/settings/biometrics/BiometricsSplitScreenDialog.java
index 79feb0b5..fab591bb 100644
--- a/Settings/src/com/android/settings/biometrics/BiometricsSplitScreenDialog.java
+++ b/Settings/src/com/android/settings/biometrics/BiometricsSplitScreenDialog.java
@@ -28,7 +28,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java b/Settings/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java
index ce12c592..9701c7d9 100644
--- a/Settings/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java
+++ b/Settings/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetup.java
@@ -32,7 +32,7 @@ import android.view.View;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollActivity;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.combination.CombinedBiometricStatusUtils;
diff --git a/Settings/src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtils.java b/Settings/src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtils.java
index 2eee9df6..3977539f 100644
--- a/Settings/src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtils.java
+++ b/Settings/src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtils.java
@@ -33,7 +33,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.BasePreferenceController.AvailabilityStatus;
diff --git a/Settings/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java b/Settings/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
index b1747888..b0ebd4f1 100644
--- a/Settings/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
+++ b/Settings/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
@@ -41,7 +41,7 @@ import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricStatusPreferenceController;
diff --git a/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettings.java b/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettings.java
index c50e6935..29910ad8 100644
--- a/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettings.java
+++ b/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettings.java
@@ -18,7 +18,7 @@ package com.android.settings.biometrics.combination;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
/**
diff --git a/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricSettings.java b/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricSettings.java
index 671a5b65..1d0dcad2 100644
--- a/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricSettings.java
+++ b/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricSettings.java
@@ -27,7 +27,7 @@ import android.os.UserHandle;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.activeunlock.ActiveUnlockContentListener.OnContentChangedListener;
import com.android.settings.biometrics.activeunlock.ActiveUnlockDeviceNameListener;
import com.android.settings.biometrics.activeunlock.ActiveUnlockRequireBiometricSetup;
diff --git a/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java b/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java
index 2cd239e2..34d22bc1 100644
--- a/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java
+++ b/Settings/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java
@@ -24,7 +24,7 @@ import android.os.UserManager;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.biometrics.ParentalControlsUtils;
diff --git a/Settings/src/com/android/settings/biometrics/face/AnimationParticle.java b/Settings/src/com/android/settings/biometrics/face/AnimationParticle.java
index a192e9f1..e56bb178 100644
--- a/Settings/src/com/android/settings/biometrics/face/AnimationParticle.java
+++ b/Settings/src/com/android/settings/biometrics/face/AnimationParticle.java
@@ -25,7 +25,7 @@ import android.graphics.Rect;
import android.graphics.RectF;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java b/Settings/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java
index 70428704..03d674c9 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java
@@ -21,7 +21,7 @@ import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityToggle.java b/Settings/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityToggle.java
index b0b94888..abcc24a2 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityToggle.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityToggle.java
@@ -24,7 +24,7 @@ import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.material.materialswitch.MaterialSwitch;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/Settings/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 6862bc92..47d01a1e 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -40,7 +40,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/Settings/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
index da3689a6..c5ca5d2e 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
@@ -29,7 +29,7 @@ import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricEnrollSidecar;
import com.android.settings.biometrics.BiometricErrorDialog;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceEnrollFinish.java b/Settings/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
index 16aeeb0c..b6f42e4a 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.os.Bundle;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/Settings/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index d776b9af..623f145e 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -45,7 +45,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollActivity;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java b/Settings/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
index aabbf6f9..61ff33d2 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
@@ -26,7 +26,7 @@ import android.view.View;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Displays parental consent information for face authentication.
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java b/Settings/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java
index 853ca7c4..ef119606 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java
@@ -38,7 +38,7 @@ import android.view.TextureView;
import android.view.View;
import android.widget.ImageView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollSidecar;
import com.android.settings.core.InstrumentedPreferenceFragment;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceFeatureProviderImpl.java b/Settings/src/com/android/settings/biometrics/face/FaceFeatureProviderImpl.java
index 8b7edce4..f2484e4a 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceFeatureProviderImpl.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceFeatureProviderImpl.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class FaceFeatureProviderImpl implements FaceFeatureProvider {
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java b/Settings/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
index 12213894..99e3f879 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
@@ -25,7 +25,7 @@ import android.os.UserHandle;
import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController {
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceSettings.java b/Settings/src/com/android/settings/biometrics/face/FaceSettings.java
index 197aca03..afeb036e 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -37,7 +37,7 @@ import android.widget.Button;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java b/Settings/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
index e5f7c4ff..2279fd1b 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
@@ -25,7 +25,7 @@ import android.widget.Button;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.widget.LayoutPreference;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java b/Settings/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
index e2123f05..02ccf80e 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
@@ -29,7 +29,7 @@ import androidx.annotation.NonNull;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.utils.AnnotationSpan;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java b/Settings/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
index ae5b62bc..cd3adfb2 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
@@ -35,7 +35,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/biometrics/face/FaceStatusUtils.java b/Settings/src/com/android/settings/biometrics/face/FaceStatusUtils.java
index 7c075cc3..8e10e564 100644
--- a/Settings/src/com/android/settings/biometrics/face/FaceStatusUtils.java
+++ b/Settings/src/com/android/settings/biometrics/face/FaceStatusUtils.java
@@ -21,7 +21,7 @@ import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.face.FaceManager;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.biometrics.ParentalControlsUtils;
diff --git a/Settings/src/com/android/settings/biometrics/face/ParticleCollection.java b/Settings/src/com/android/settings/biometrics/face/ParticleCollection.java
index 399beec3..fa09e1b1 100644
--- a/Settings/src/com/android/settings/biometrics/face/ParticleCollection.java
+++ b/Settings/src/com/android/settings/biometrics/face/ParticleCollection.java
@@ -21,7 +21,7 @@ import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Rect;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollSidecar;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 90b93461..3c082294 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -64,7 +64,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollSidecar;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.biometrics.BiometricsEnrollEnrolling;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 6b7538ae..5949ac2a 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -34,7 +34,7 @@ import android.view.accessibility.AccessibilityManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricEnrollSidecar;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 9c89f24e..e6a5128e 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -30,7 +30,7 @@ import android.view.ViewGroup;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index f92cfbf6..39d4c5f1 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -39,7 +39,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.biometrics.BiometricUtils;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
index 7f4142de..b5e08b4c 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
@@ -26,7 +26,7 @@ import android.view.View;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Displays parental consent information for fingerprint authentication.
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index 52d7d2be..9c5a4ee9 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -28,7 +28,7 @@ import android.os.SystemClock;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollSidecar;
import com.android.settings.biometrics.BiometricUtils;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
index 155ced51..f8cbee1b 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
@@ -33,7 +33,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/** Fingerprint error dialog, will be shown when an error occurs during fingerprint enrollment. */
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
index 1d8e7794..98abda3e 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
@@ -31,7 +31,7 @@ import android.view.View;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A view containing a VideoView for showing the user how to enroll a fingerprint
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
index 2916872e..e4343cc8 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
@@ -30,7 +30,7 @@ import android.view.animation.Interpolator;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
/**
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 2aacbe4b..11b56969 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -62,7 +62,7 @@ import androidx.preference.PreferenceViewHolder;
import androidx.preference.TwoStatePreference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java
index 1005e3f6..0f94d073 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java
@@ -21,7 +21,7 @@ import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.fingerprint.FingerprintManager;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.ParentalControlsUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
index 307553d7..56e6c590 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
@@ -20,7 +20,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.hardware.fingerprint.FingerprintManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.google.android.setupcompat.template.FooterButton;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java b/Settings/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
index 6590530c..31701727 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -29,7 +29,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java b/Settings/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
index 971a4104..0a029fb4 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.os.UserHandle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.password.ChooseLockSettingsHelper;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollDrawable.java b/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollDrawable.java
index 480b17de..ac9c9f46 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollDrawable.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollDrawable.java
@@ -38,7 +38,7 @@ import android.view.animation.AccelerateDecelerateInterpolator;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* UDFPS fingerprint drawable that is shown when enrolling
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java b/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java
index c798dff4..bf36d6ae 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java
@@ -36,7 +36,7 @@ import android.widget.LinearLayout;
import androidx.annotation.ColorInt;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.systemui.biometrics.UdfpsUtils;
import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollProgressBarDrawable.java b/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollProgressBarDrawable.java
index 75251cf3..106c5081 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollProgressBarDrawable.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollProgressBarDrawable.java
@@ -39,7 +39,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* UDFPS enrollment progress bar.
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java b/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java
index 4a2a243d..18fb6e1d 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java
@@ -33,7 +33,7 @@ import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
/**
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java b/Settings/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
index 60ced6e9..c84e66b1 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
@@ -34,7 +34,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.function.Function;
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint/feature/SfpsRestToUnlockFeatureImpl.kt b/Settings/src/com/android/settings/biometrics/fingerprint/feature/SfpsRestToUnlockFeatureImpl.kt
index de78a2a3..8d7dbd3e 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint/feature/SfpsRestToUnlockFeatureImpl.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint/feature/SfpsRestToUnlockFeatureImpl.kt
@@ -21,7 +21,7 @@ import android.content.Context
class SfpsRestToUnlockFeatureImpl : SfpsRestToUnlockFeature {
override fun getDescriptionForSfps(context: Context) : String {
return context.getString(
- com.android.settings.R
+ com.cariad.cea.settings.R
.string.security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message
)
}
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
index 0ef1d256..73590e74 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
@@ -19,7 +19,7 @@ package com.android.settings.biometrics.fingerprint2.conversion
import android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_CANCELED
import android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_UNABLE_TO_PROCESS
import android.hardware.fingerprint.FingerprintManager
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.lib.model.EnrollReason
import com.android.settings.biometrics.fingerprint2.lib.model.FingerEnrollState
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
index d26b812a..c3fa90d7 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
@@ -29,7 +29,7 @@ import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import com.android.internal.widget.LockPatternUtils
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.SetupWizardUtils
import com.android.settings.Utils.SETTINGS_PACKAGE_NAME
import com.android.settings.biometrics.BiometricEnrollBase
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollConfirmationV2Fragment.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollConfirmationV2Fragment.kt
index d8c1c93f..871eec09 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollConfirmationV2Fragment.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollConfirmationV2Fragment.kt
@@ -26,7 +26,7 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintEnrollConfirmationViewModel
import com.google.android.setupcompat.template.FooterBarMixin
import com.google.android.setupcompat.template.FooterButton
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollEnrollingV2Fragment.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollEnrollingV2Fragment.kt
index be30346d..79f8a42c 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollEnrollingV2Fragment.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollEnrollingV2Fragment.kt
@@ -18,7 +18,7 @@ package com.android.settings.biometrics.fingerprint2.ui.enrollment.fragment
import android.os.Bundle
import androidx.fragment.app.Fragment
-import com.android.settings.R
+import com.cariad.cea.settings.R
/** A fragment that is responsible for enrolling a users fingerprint. */
class FingerprintEnrollEnrollingV2Fragment : Fragment(R.layout.fingerprint_enroll_enrolling) {
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollFindSensorV2Fragment.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollFindSensorV2Fragment.kt
index 2b1ff9bf..bdb83b22 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollFindSensorV2Fragment.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollFindSensorV2Fragment.kt
@@ -27,7 +27,7 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import com.airbnb.lottie.LottieAnimationView
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint.FingerprintErrorDialog
import com.android.settings.biometrics.fingerprint.FingerprintFindSensorAnimation
import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintEnrollFindSensorViewModel
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollIntroV2Fragment.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollIntroV2Fragment.kt
index 53d0ddf1..3158e6d5 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollIntroV2Fragment.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollIntroV2Fragment.kt
@@ -34,7 +34,7 @@ import androidx.annotation.VisibleForTesting
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.lib.model.Unicorn
import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintEnrollIntroViewModel
import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintGatekeeperViewModel
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/fragment/RFPSEnrollFragment.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/fragment/RFPSEnrollFragment.kt
index a9cd16fe..bd607103 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/fragment/RFPSEnrollFragment.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/fragment/RFPSEnrollFragment.kt
@@ -32,7 +32,7 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.domain.interactor.OrientationInteractor
import com.android.settings.biometrics.fingerprint2.lib.model.FingerEnrollState
import com.android.settings.biometrics.fingerprint2.ui.enrollment.modules.enrolling.rfps.ui.viewmodel.RFPSIconTouchViewModel
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/FingerprintErrorDialog.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/FingerprintErrorDialog.kt
index 9c0040b8..c2b97cb2 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/FingerprintErrorDialog.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/FingerprintErrorDialog.kt
@@ -23,7 +23,7 @@ import android.content.DialogInterface
import android.os.Bundle
import android.util.Log
import androidx.fragment.app.Fragment
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.lib.model.FingerEnrollState
import com.android.settings.core.instrumentation.InstrumentedDialogFragment
import kotlin.coroutines.resume
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/IconTouchDialog.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/IconTouchDialog.kt
index c0863432..2b7602dd 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/IconTouchDialog.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/IconTouchDialog.kt
@@ -23,7 +23,7 @@ import android.content.DialogInterface
import android.os.Bundle
import android.util.Log
import androidx.fragment.app.Fragment
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.instrumentation.InstrumentedDialogFragment
import kotlin.coroutines.resume
import kotlinx.coroutines.suspendCancellableCoroutine
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/RFPSProgressBar.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/RFPSProgressBar.kt
index 5a6fc149..b702fcdd 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/RFPSProgressBar.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/rfps/ui/widget/RFPSProgressBar.kt
@@ -27,7 +27,7 @@ import android.util.AttributeSet
import android.util.Log
import android.view.animation.AnimationUtils
import android.view.animation.Interpolator
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.widget.RingProgressBar
/** Progress bar for rear fingerprint enrollment. */
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintDeletionDialog.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintDeletionDialog.kt
index 46f64de0..85149152 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintDeletionDialog.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintDeletionDialog.kt
@@ -25,7 +25,7 @@ import android.content.DialogInterface
import android.os.Bundle
import android.os.UserManager
import androidx.appcompat.app.AlertDialog
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.lib.model.FingerprintData
import com.android.settings.core.instrumentation.InstrumentedDialogFragment
import kotlin.coroutines.resume
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsPreference.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsPreference.kt
index 09dcb81f..8051ae66 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsPreference.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsPreference.kt
@@ -21,7 +21,7 @@ import android.util.Log
import android.view.View
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceViewHolder
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.lib.model.FingerprintData
import com.android.settingslib.widget.TwoTargetPreference
import kotlinx.coroutines.delay
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt
index 9fef0c5e..70106d2c 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt
@@ -26,7 +26,7 @@ import android.text.TextUtils
import android.util.Log
import android.widget.ImeAwareEditText
import androidx.appcompat.app.AlertDialog
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.lib.model.FingerprintData
import com.android.settings.core.instrumentation.InstrumentedDialogFragment
import kotlin.coroutines.resume
diff --git a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsV2Fragment.kt b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsV2Fragment.kt
index bd905242..bbe2a0c8 100644
--- a/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsV2Fragment.kt
+++ b/Settings/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsV2Fragment.kt
@@ -36,7 +36,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.preference.Preference
import androidx.preference.PreferenceCategory
import com.android.internal.widget.LockPatternUtils
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils.SETTINGS_PACKAGE_NAME
import com.android.settings.biometrics.BiometricEnrollBase
import com.android.settings.biometrics.BiometricEnrollBase.CONFIRM_REQUEST
diff --git a/Settings/src/com/android/settings/biometrics2/data/repository/FingerprintRepository.java b/Settings/src/com/android/settings/biometrics2/data/repository/FingerprintRepository.java
index 6a9892ab..8469e9d9 100644
--- a/Settings/src/com/android/settings/biometrics2/data/repository/FingerprintRepository.java
+++ b/Settings/src/com/android/settings/biometrics2/data/repository/FingerprintRepository.java
@@ -30,7 +30,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.ParentalControlsUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingIconTouchDialog.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingIconTouchDialog.kt
index 9f99d173..5d5c2a59 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingIconTouchDialog.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingIconTouchDialog.kt
@@ -21,7 +21,7 @@ import android.content.DialogInterface
import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
-import com.android.settings.R
+import com.cariad.cea.settings.R
/**
* Icon Touch dialog
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt
index 2530628c..6fdfd44f 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt
@@ -43,7 +43,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics2.ui.model.EnrollmentProgress
import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt
index 7faeeac9..07dc333c 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt
@@ -48,7 +48,7 @@ import com.airbnb.lottie.LottieComposition
import com.airbnb.lottie.LottieCompositionFactory
import com.airbnb.lottie.LottieProperty
import com.airbnb.lottie.model.KeyPath
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics2.ui.model.EnrollmentProgress
import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.kt
index 7e754aca..08cdb57d 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.kt
@@ -44,7 +44,7 @@ import androidx.lifecycle.repeatOnLifecycle
import com.airbnb.lottie.LottieAnimationView
import com.airbnb.lottie.LottieComposition
import com.airbnb.lottie.LottieCompositionFactory
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics2.ui.model.EnrollmentProgress
import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
import com.android.settings.biometrics2.ui.viewmodel.DeviceRotationViewModel
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollErrorDialog.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollErrorDialog.kt
index 882cbcf8..57daa808 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollErrorDialog.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollErrorDialog.kt
@@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint.FingerprintErrorDialog.getErrorMessage
import com.android.settings.biometrics.fingerprint.FingerprintErrorDialog.getErrorTitle
import com.android.settings.biometrics.fingerprint.FingerprintErrorDialog.getSetupErrorMessage
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt
index be24fc65..6395911f 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt
@@ -31,7 +31,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint.FingerprintFindSensorAnimation
import com.android.settings.biometrics2.ui.model.EnrollmentProgress
import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt
index 7455be1d..ffa88306 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt
@@ -33,7 +33,7 @@ import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import com.airbnb.lottie.LottieAnimationView
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics2.ui.model.EnrollmentProgress
import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
import com.android.settings.biometrics2.ui.viewmodel.DeviceFoldedViewModel
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt
index 3dce99c5..e3721bea 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt
@@ -24,7 +24,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.ViewModelProvider
import com.airbnb.lottie.LottieAnimationView
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel
import com.google.android.setupcompat.template.FooterBarMixin
import com.google.android.setupcompat.template.FooterButton
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt
index 2af2deee..4b4dcc7f 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt
@@ -23,7 +23,7 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.ViewModelProvider
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel
import com.google.android.setupcompat.template.FooterBarMixin
import com.google.android.setupcompat.template.FooterButton
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt
index d1b37994..68c01779 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt
@@ -37,7 +37,7 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics2.ui.model.FingerprintEnrollIntroStatus
import com.android.settings.biometrics2.ui.model.FingerprintEnrollable.FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX
import com.android.settings.biometrics2.ui.model.FingerprintEnrollable.FINGERPRINT_ENROLLABLE_OK
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt
index ec965970..ca4c967e 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt
@@ -39,7 +39,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.lifecycle.viewmodel.CreationExtras
import androidx.lifecycle.viewmodel.MutableCreationExtras
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.biometrics.BiometricEnrollBase
import com.android.settings.biometrics2.factory.BiometricsViewModelFactory
diff --git a/Settings/src/com/android/settings/biometrics2/ui/view/SkipSetupFindFpsDialog.kt b/Settings/src/com/android/settings/biometrics2/ui/view/SkipSetupFindFpsDialog.kt
index bb74e360..1df26c11 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/view/SkipSetupFindFpsDialog.kt
+++ b/Settings/src/com/android/settings/biometrics2/ui/view/SkipSetupFindFpsDialog.kt
@@ -22,7 +22,7 @@ import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
import androidx.lifecycle.ViewModelProvider
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel
/**
diff --git a/Settings/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModel.java b/Settings/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModel.java
index 1cfec52d..7136cdcb 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModel.java
+++ b/Settings/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModel.java
@@ -37,7 +37,7 @@ import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.fingerprint.FingerprintUpdater;
import com.android.settings.biometrics.fingerprint.MessageDisplayController;
import com.android.settings.biometrics2.ui.model.EnrollmentProgress;
diff --git a/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollDrawable.java b/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollDrawable.java
index 4b0b624f..aa0f0469 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollDrawable.java
+++ b/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollDrawable.java
@@ -44,7 +44,7 @@ import android.view.animation.AccelerateDecelerateInterpolator;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java b/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java
index 8cb4bb26..8348e9ae 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java
+++ b/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java
@@ -39,7 +39,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* UDFPS enrollment progress bar.
diff --git a/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java b/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java
index c99cb2dd..e6a79a72 100644
--- a/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java
+++ b/Settings/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java
@@ -36,7 +36,7 @@ import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.systemui.biometrics.UdfpsUtils;
import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
diff --git a/Settings/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/Settings/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index 13268314..a43b7913 100644
--- a/Settings/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/Settings/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -44,7 +44,7 @@ import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatteryMeterView;
import com.android.settingslib.bluetooth.BluetoothUtils;
diff --git a/Settings/src/com/android/settings/bluetooth/BlockingPrefWithSliceController.java b/Settings/src/com/android/settings/bluetooth/BlockingPrefWithSliceController.java
index 0690186b..cb15e4dd 100644
--- a/Settings/src/com/android/settings/bluetooth/BlockingPrefWithSliceController.java
+++ b/Settings/src/com/android/settings/bluetooth/BlockingPrefWithSliceController.java
@@ -44,7 +44,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java b/Settings/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java
index 2914cf4c..4b415fd3 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java
@@ -31,7 +31,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java b/Settings/src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java
index d0fabc64..e16b6737 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java
@@ -31,7 +31,7 @@ import androidx.annotation.NonNull;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import java.util.List;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java
index d62543bb..8ab46394 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java
@@ -37,7 +37,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LeAudioProfile;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFooterPreferenceController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFooterPreferenceController.java
index d6bd0da4..77ddf745 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFooterPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.bluetooth;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityFooterPreferenceController;
/** Preference controller for footer in bluetooth details audio routing page. */
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
index 2ade4eca..124ce0c4 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.ActionButtonsPreference;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
index ad65ce4b..bbc950b8 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
@@ -41,7 +41,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SettingsUIDeviceConfig;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
index 1f63993e..a43fc51e 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
@@ -29,7 +29,7 @@ import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index 5ffa8cf7..26477346 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -25,7 +25,7 @@ import android.util.Pair;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControlsController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControlsController.java
index 162abc78..807eebaf 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControlsController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControlsController.java
@@ -24,7 +24,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityHearingAidsFragment;
import com.android.settings.accessibility.ArrowPreference;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
index 99430132..bfdf9106 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java
index d1d00d8a..f7ef1800 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.SpacePreference;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index 943d99bb..2a9caef9 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -35,7 +35,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SettingsUIDeviceConfig;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
index e5fb365e..3939fe79 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
@@ -33,7 +33,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/Settings/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 9c68c9cc..91b0d362 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -44,7 +44,7 @@ import android.view.ViewTreeObserver;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.connecteddevice.stylus.StylusDevicesController;
import com.android.settings.core.SettingsUIDeviceConfig;
import com.android.settings.dashboard.RestrictedDashboardFragment;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/Settings/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
index 129b2182..79cf82c2 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -29,7 +29,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java b/Settings/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java
index d71328ee..9064e06d 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java
@@ -29,7 +29,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityStatsLogUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/Settings/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index ac0c63bc..ad9c958a 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -42,7 +42,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/Settings/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 4b21b2ec..af7293fd 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -24,7 +24,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/Settings/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index 55c76e3c..6cca0368 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;
import java.time.Duration;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothEnabler.java b/Settings/src/com/android/settings/bluetooth/BluetoothEnabler.java
index eaa0b966..9278933e 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -27,7 +27,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.WirelessUtils;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java b/Settings/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java
index cffd68c8..841eaf69 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java
@@ -48,7 +48,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothFindBroadcastsHeaderController.java b/Settings/src/com/android/settings/bluetooth/BluetoothFindBroadcastsHeaderController.java
index d34476ba..20b150fe 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothFindBroadcastsHeaderController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothFindBroadcastsHeaderController.java
@@ -27,7 +27,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.BluetoothBroadcastUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/Settings/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index c5b29f3e..5d05e2a1 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -37,7 +37,7 @@ import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothPairingController.java b/Settings/src/com/android/settings/bluetooth/BluetoothPairingController.java
index f75d301a..71f7b1b2 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -28,7 +28,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
import com.android.settings.core.SettingsUIDeviceConfig;
import com.android.settingslib.bluetooth.BluetoothUtils;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/Settings/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index 234d6d2e..2d573dd6 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -26,7 +26,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/Settings/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index 33e6fc3c..0fdd1cc8 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -39,7 +39,7 @@ import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/Settings/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
index c8355860..78bbd9de 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothPairingService.java b/Settings/src/com/android/settings/bluetooth/BluetoothPairingService.java
index d8487e4d..37e9ca11 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothPairingService.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -34,7 +34,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.core.app.NotificationCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* BluetoothPairingService shows a notification if there is a pending bond request
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/Settings/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 41606bac..ec9c0e7a 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -39,7 +39,7 @@ import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import java.util.List;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/Settings/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index 2212e23e..a29666ee 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -29,7 +29,7 @@ import android.os.PowerManager;
import android.os.UserManager;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothProgressCategory.java b/Settings/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
index ec948e03..882ab6a4 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import com.android.settings.ProgressCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A Bluetooth discovery progress category
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/Settings/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index fd8ef1fd..69b5caca 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -33,7 +33,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.connecteddevice.BluetoothDashboardFragment;
import com.android.settings.slices.CustomSliceRegistry;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/Settings/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
index 4587fbaa..a063fd26 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
@@ -23,7 +23,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SummaryUpdater;
import com.android.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/Settings/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
index ac557580..a0bf273e 100644
--- a/Settings/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
@@ -26,7 +26,7 @@ import android.view.View;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.location.BluetoothScanningFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/bluetooth/CompanionAppWidgetPreference.java b/Settings/src/com/android/settings/bluetooth/CompanionAppWidgetPreference.java
index cd064337..0bc855bf 100644
--- a/Settings/src/com/android/settings/bluetooth/CompanionAppWidgetPreference.java
+++ b/Settings/src/com/android/settings/bluetooth/CompanionAppWidgetPreference.java
@@ -24,7 +24,7 @@ import android.widget.ImageButton;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A custom preference for companion device apps. Added a button for association removal
diff --git a/Settings/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.kt b/Settings/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.kt
index 095bed97..fd78fef2 100644
--- a/Settings/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.kt
+++ b/Settings/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.kt
@@ -32,7 +32,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.preference.Preference
import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceGroup
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.dashboard.RestrictedDashboardFragment
import com.android.settingslib.bluetooth.BluetoothCallback
import com.android.settingslib.bluetooth.BluetoothDeviceFilter
diff --git a/Settings/src/com/android/settings/bluetooth/DevicePickerActivity.java b/Settings/src/com/android/settings/bluetooth/DevicePickerActivity.java
index a4f025b2..c5e7d786 100644
--- a/Settings/src/com/android/settings/bluetooth/DevicePickerActivity.java
+++ b/Settings/src/com/android/settings/bluetooth/DevicePickerActivity.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Activity for Bluetooth device picker dialog. The device picker logic
diff --git a/Settings/src/com/android/settings/bluetooth/DevicePickerFragment.java b/Settings/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 2e810620..1b352b5f 100644
--- a/Settings/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -34,7 +34,7 @@ import android.view.MenuInflater;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.PasswordUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java b/Settings/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java
index 60d63c63..30d886f2 100644
--- a/Settings/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java
@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
diff --git a/Settings/src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java b/Settings/src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java
index 73c7d73e..717b8221 100644
--- a/Settings/src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java
@@ -27,7 +27,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.HearingDevicePairingFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java b/Settings/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
index a64874d3..6e00b2bd 100644
--- a/Settings/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
+++ b/Settings/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
@@ -33,7 +33,7 @@ import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatteryMeterView;
import com.android.settingslib.bluetooth.BluetoothUtils;
diff --git a/Settings/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java b/Settings/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java
index c15dd04a..5646530a 100644
--- a/Settings/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java
@@ -24,7 +24,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Provides a dialog for changing the advertised name of the local bluetooth adapter. */
public class LocalDeviceNameDialogFragment extends BluetoothNameDialogFragment {
diff --git a/Settings/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java b/Settings/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java
index a0234200..a49c1da0 100644
--- a/Settings/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java
+++ b/Settings/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java
@@ -27,7 +27,7 @@ import android.util.Log;
import androidx.fragment.app.FragmentTransaction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.BluetoothBroadcastUtils;
import com.android.settingslib.bluetooth.BluetoothUtils;
diff --git a/Settings/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java b/Settings/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java
index 30e5c7bf..8b67896a 100644
--- a/Settings/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java
+++ b/Settings/src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java
@@ -22,7 +22,7 @@ import android.os.SystemProperties;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.ObservableActivity;
import com.google.android.setupdesign.util.ThemeHelper;
diff --git a/Settings/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java b/Settings/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java
index 80aedd71..3c0066c5 100644
--- a/Settings/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java
@@ -42,7 +42,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settingslib.bluetooth.BluetoothBroadcastUtils;
import com.android.settingslib.bluetooth.BluetoothUtils;
diff --git a/Settings/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java b/Settings/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java
index 2ba94a19..58295796 100644
--- a/Settings/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java
+++ b/Settings/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
diff --git a/Settings/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/Settings/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index d670554a..e4e1f36a 100644
--- a/Settings/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/Settings/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -39,7 +39,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;
import kotlin.Unit;
diff --git a/Settings/src/com/android/settings/bluetooth/RequestPermissionHelper.kt b/Settings/src/com/android/settings/bluetooth/RequestPermissionHelper.kt
index 73084e43..c47b4231 100644
--- a/Settings/src/com/android/settings/bluetooth/RequestPermissionHelper.kt
+++ b/Settings/src/com/android/settings/bluetooth/RequestPermissionHelper.kt
@@ -19,7 +19,7 @@ package com.android.settings.bluetooth
import android.content.Context
import android.os.UserManager
import androidx.appcompat.app.AlertDialog
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.framework.common.devicePolicyManager
import com.android.settingslib.spaprivileged.framework.common.userManager
diff --git a/Settings/src/com/android/settings/bluetooth/Utils.java b/Settings/src/com/android/settings/bluetooth/Utils.java
index f6288b2c..c8c5e211 100644
--- a/Settings/src/com/android/settings/bluetooth/Utils.java
+++ b/Settings/src/com/android/settings/bluetooth/Utils.java
@@ -36,7 +36,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.BluetoothUtils;
diff --git a/Settings/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java b/Settings/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
index 276e7aaa..f8fbd94b 100644
--- a/Settings/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
+++ b/Settings/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
@@ -36,7 +36,7 @@ import android.view.View;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java b/Settings/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
index aefa3b7e..d9467d90 100644
--- a/Settings/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
+++ b/Settings/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
@@ -32,7 +32,7 @@ import android.util.Log;
import android.util.Pair;
import android.widget.Toast;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/Settings/src/com/android/settings/communal/CommunalDashboardFragment.java b/Settings/src/com/android/settings/communal/CommunalDashboardFragment.java
index 64f87b5f..740b6495 100644
--- a/Settings/src/com/android/settings/communal/CommunalDashboardFragment.java
+++ b/Settings/src/com/android/settings/communal/CommunalDashboardFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.communal;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
/**
diff --git a/Settings/src/com/android/settings/communal/CommunalPreferenceController.java b/Settings/src/com/android/settings/communal/CommunalPreferenceController.java
index 706e3923..dd22c2b4 100644
--- a/Settings/src/com/android/settings/communal/CommunalPreferenceController.java
+++ b/Settings/src/com/android/settings/communal/CommunalPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.communal;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/Settings/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
index d2bc319c..20755006 100644
--- a/Settings/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
+++ b/Settings/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
@@ -25,7 +25,7 @@ import android.content.pm.PackageManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
index 2855f0ab..979ec6f6 100644
--- a/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
+++ b/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
@@ -23,7 +23,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.nfc.NfcPreferenceController;
diff --git a/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index 8e230cbb..e1113ba5 100644
--- a/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -19,7 +19,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.print.PrintSettingPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/Settings/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
index 0535d153..2a1d8566 100644
--- a/Settings/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
+++ b/Settings/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
@@ -32,7 +32,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.HearingAidUtils;
import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
diff --git a/Settings/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/Settings/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index 66f2f1b8..1f0a6532 100644
--- a/Settings/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -23,7 +23,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController;
diff --git a/Settings/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/Settings/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 04ba5d2b..604f5a62 100644
--- a/Settings/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -25,7 +25,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.core.SettingsUIDeviceConfig;
diff --git a/Settings/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/Settings/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
index 5df31bc6..eb8364cc 100644
--- a/Settings/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
@@ -28,7 +28,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.AlwaysDiscoverable;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/connecteddevice/NfcAndPaymentFragment.java b/Settings/src/com/android/settings/connecteddevice/NfcAndPaymentFragment.java
index feb757f9..a9ceb560 100644
--- a/Settings/src/com/android/settings/connecteddevice/NfcAndPaymentFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/NfcAndPaymentFragment.java
@@ -24,7 +24,7 @@ import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java b/Settings/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
index ee0021ec..c6a17305 100644
--- a/Settings/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
+++ b/Settings/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
@@ -21,7 +21,7 @@ import android.content.pm.PackageManager;
import android.nfc.NfcAdapter;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/Settings/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
index 05a17cc9..bcb42f3a 100644
--- a/Settings/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/Settings/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
index 33f8b735..e9b51baa 100644
--- a/Settings/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
+++ b/Settings/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.BluetoothDevicePreference;
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
diff --git a/Settings/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java b/Settings/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
index 9db333d4..78a7316c 100644
--- a/Settings/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
+++ b/Settings/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.connecteddevice;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceDashboardFragment.java b/Settings/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceDashboardFragment.java
index 2c6c1121..3274d882 100644
--- a/Settings/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceDashboardFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceDashboardFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.connecteddevice.fastpair;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java b/Settings/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java
index 5bf97ab0..223118e6 100644
--- a/Settings/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java
+++ b/Settings/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java
@@ -29,7 +29,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java b/Settings/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
index cd23103c..965dcbba 100644
--- a/Settings/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
+++ b/Settings/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
@@ -45,7 +45,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
import com.android.settings.dashboard.profileselector.UserAdapter;
import com.android.settingslib.PrimarySwitchPreference;
diff --git a/Settings/src/com/android/settings/connecteddevice/stylus/StylusUsiDetailsFragment.java b/Settings/src/com/android/settings/connecteddevice/stylus/StylusUsiDetailsFragment.java
index ea9781e3..d9a0df8e 100644
--- a/Settings/src/com/android/settings/connecteddevice/stylus/StylusUsiDetailsFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/stylus/StylusUsiDetailsFragment.java
@@ -24,7 +24,7 @@ import android.view.InputDevice;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java b/Settings/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java
index 23db3cb1..effa557c 100644
--- a/Settings/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java
+++ b/Settings/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java
@@ -29,7 +29,7 @@ import androidx.annotation.NonNull;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate;
diff --git a/Settings/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt b/Settings/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt
index 10e3f849..8ea51058 100644
--- a/Settings/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt
+++ b/Settings/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt
@@ -35,7 +35,7 @@ import androidx.lifecycle.LifecycleOwner
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
import com.android.net.thread.platform.flags.Flags
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.TogglePreferenceController
import java.util.concurrent.Executor
diff --git a/Settings/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/Settings/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
index 221aab54..977771e8 100644
--- a/Settings/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/Settings/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -28,7 +28,7 @@ import android.os.UserHandle;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/Settings/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index b5a9e5a9..84810be2 100644
--- a/Settings/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -31,7 +31,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
index 8782c796..8eb047e6 100644
--- a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
+++ b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
@@ -25,7 +25,7 @@ import android.content.Context;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
index f8cabbc0..591e2481 100644
--- a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
+++ b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
@@ -26,7 +26,7 @@ import android.view.View;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index 04fab7d7..ddde53c0 100644
--- a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -29,7 +29,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
index 39d7c751..01e54fcf 100644
--- a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
+++ b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.widget.LayoutPreference;
diff --git a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
index f00435a0..06a6d989 100644
--- a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
+++ b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
@@ -29,7 +29,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
/**
diff --git a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
index a0231712..789784c8 100644
--- a/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
+++ b/Settings/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
@@ -28,7 +28,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
/**
diff --git a/Settings/src/com/android/settings/core/LiveDataController.java b/Settings/src/com/android/settings/core/LiveDataController.java
index 2bca5b62..fa2711a0 100644
--- a/Settings/src/com/android/settings/core/LiveDataController.java
+++ b/Settings/src/com/android/settings/core/LiveDataController.java
@@ -26,7 +26,7 @@ import androidx.lifecycle.MutableLiveData;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.ThreadUtils;
/**
diff --git a/Settings/src/com/android/settings/core/PreferenceXmlParserUtils.java b/Settings/src/com/android/settings/core/PreferenceXmlParserUtils.java
index df3cd922..99682429 100644
--- a/Settings/src/com/android/settings/core/PreferenceXmlParserUtils.java
+++ b/Settings/src/com/android/settings/core/PreferenceXmlParserUtils.java
@@ -29,7 +29,7 @@ import android.util.Xml;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/Settings/src/com/android/settings/core/SettingsBaseActivity.java b/Settings/src/com/android/settings/core/SettingsBaseActivity.java
index e43772e1..a1260d2c 100644
--- a/Settings/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/Settings/src/com/android/settings/core/SettingsBaseActivity.java
@@ -39,7 +39,7 @@ import androidx.annotation.Nullable;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.SubSettings;
import com.android.settings.core.CategoryMixin.CategoryHandler;
diff --git a/Settings/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/Settings/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 8214d0b0..23b8e644 100644
--- a/Settings/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/Settings/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -57,7 +57,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
diff --git a/Settings/src/com/android/settings/dashboard/DashboardFragment.java b/Settings/src/com/android/settings/dashboard/DashboardFragment.java
index 09730767..8d98fa56 100644
--- a/Settings/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/Settings/src/com/android/settings/dashboard/DashboardFragment.java
@@ -40,7 +40,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.CategoryMixin.CategoryHandler;
diff --git a/Settings/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/Settings/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
index f43445ba..9dab0689 100644
--- a/Settings/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
+++ b/Settings/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
@@ -33,7 +33,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java
index 77dc3a75..d528e8d8 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.dashboard.profileselector;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accounts.AccountPersonalDashboardFragment;
import com.android.settings.accounts.AccountPrivateDashboardFragment;
import com.android.settings.accounts.AccountWorkProfileDashboardFragment;
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
index 4df1fdd3..bca9122b 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
@@ -41,7 +41,7 @@ import androidx.fragment.app.FragmentManager;
import com.android.internal.widget.DialogTitle;
import com.android.internal.widget.LinearLayoutManager;
import com.android.internal.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.drawer.Tile;
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index 8279588c..d7a0b733 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -47,7 +47,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectKeyboardFragment.java b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectKeyboardFragment.java
index d35692ce..993c9ceb 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectKeyboardFragment.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectKeyboardFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.dashboard.profileselector;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
/**
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
index feaec74b..d2b3a786 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
@@ -20,7 +20,7 @@ import android.os.Bundle;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.location.LocationPersonalSettings;
import com.android.settings.location.LocationSwitchBarController;
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java
index 8e48c7bc..dcd5ccfc 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.dashboard.profileselector;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.location.LocationServices;
import com.android.settings.location.LocationServicesForWork;
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java
index 2caf8dba..401411bf 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment;
/**
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
index b523e7ef..27fbfa40 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
@@ -31,7 +31,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.deviceinfo.StorageCategoryFragment;
import com.android.settings.deviceinfo.VolumeOptionMenuController;
diff --git a/Settings/src/com/android/settings/dashboard/profileselector/UserAdapter.java b/Settings/src/com/android/settings/dashboard/profileselector/UserAdapter.java
index c9e49f17..d8d2679f 100644
--- a/Settings/src/com/android/settings/dashboard/profileselector/UserAdapter.java
+++ b/Settings/src/com/android/settings/dashboard/profileselector/UserAdapter.java
@@ -38,7 +38,7 @@ import android.widget.TextView;
import com.android.internal.util.UserIcons;
import com.android.internal.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/datausage/AppDataUsage.java b/Settings/src/com/android/settings/datausage/AppDataUsage.java
index dbc0bc76..143d7c97 100644
--- a/Settings/src/com/android/settings/datausage/AppDataUsage.java
+++ b/Settings/src/com/android/settings/datausage/AppDataUsage.java
@@ -39,7 +39,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.datausage.lib.AppDataUsageDetailsRepository;
import com.android.settings.datausage.lib.NetworkTemplates;
diff --git a/Settings/src/com/android/settings/datausage/AppDataUsagePreference.java b/Settings/src/com/android/settings/datausage/AppDataUsagePreference.java
index d8c73922..247b59e8 100644
--- a/Settings/src/com/android/settings/datausage/AppDataUsagePreference.java
+++ b/Settings/src/com/android/settings/datausage/AppDataUsagePreference.java
@@ -20,7 +20,7 @@ import android.widget.ProgressBar;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
@@ -43,7 +43,7 @@ public class AppDataUsagePreference extends AppPreference {
mPercent = percent;
if (item.restricted && item.total <= 0) {
- setSummary(com.android.settings.R.string.data_usage_app_restricted);
+ setSummary(R.string.data_usage_app_restricted);
} else {
setSummary(DataUsageUtils.formatDataUsage(context, item.total));
}
diff --git a/Settings/src/com/android/settings/datausage/BillingCyclePreference.kt b/Settings/src/com/android/settings/datausage/BillingCyclePreference.kt
index a6904bc4..79733554 100644
--- a/Settings/src/com/android/settings/datausage/BillingCyclePreference.kt
+++ b/Settings/src/com/android/settings/datausage/BillingCyclePreference.kt
@@ -23,7 +23,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.SubSettingLauncher
import com.android.settings.datausage.lib.BillingCycleRepository
import com.android.settings.network.mobileDataEnabledFlow
diff --git a/Settings/src/com/android/settings/datausage/BillingCycleSettings.java b/Settings/src/com/android/settings/datausage/BillingCycleSettings.java
index 9a7411a7..84fd7f66 100644
--- a/Settings/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/Settings/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -42,7 +42,7 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.datausage.lib.NetworkTemplates;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/datausage/CellDataPreference.java b/Settings/src/com/android/settings/datausage/CellDataPreference.java
index 3bd3eccf..8e744c43 100644
--- a/Settings/src/com/android/settings/datausage/CellDataPreference.java
+++ b/Settings/src/com/android/settings/datausage/CellDataPreference.java
@@ -32,7 +32,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.MobileDataEnabledListener;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/datausage/ChartDataUsagePreference.java b/Settings/src/com/android/settings/datausage/ChartDataUsagePreference.java
index e8e21097..462c8c8f 100644
--- a/Settings/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/Settings/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -32,7 +32,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.datausage.lib.NetworkCycleChartData;
import com.android.settings.datausage.lib.NetworkUsageData;
diff --git a/Settings/src/com/android/settings/datausage/DataSaverPreference.java b/Settings/src/com/android/settings/datausage/DataSaverPreference.java
index 305d061b..506fe5b3 100644
--- a/Settings/src/com/android/settings/datausage/DataSaverPreference.java
+++ b/Settings/src/com/android/settings/datausage/DataSaverPreference.java
@@ -19,7 +19,7 @@ import android.util.AttributeSet;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class DataSaverPreference extends Preference implements DataSaverBackend.Listener {
diff --git a/Settings/src/com/android/settings/datausage/DataSaverSummary.kt b/Settings/src/com/android/settings/datausage/DataSaverSummary.kt
index cdd46f2f..cd2a99b9 100644
--- a/Settings/src/com/android/settings/datausage/DataSaverSummary.kt
+++ b/Settings/src/com/android/settings/datausage/DataSaverSummary.kt
@@ -19,7 +19,7 @@ import android.app.settings.SettingsEnums
import android.content.Context
import android.os.Bundle
import android.telephony.SubscriptionManager
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.SettingsActivity
import com.android.settings.dashboard.DashboardFragment
import com.android.settings.search.BaseSearchIndexProvider
diff --git a/Settings/src/com/android/settings/datausage/DataUsageList.kt b/Settings/src/com/android/settings/datausage/DataUsageList.kt
index 3083fb75..a97065ba 100644
--- a/Settings/src/com/android/settings/datausage/DataUsageList.kt
+++ b/Settings/src/com/android/settings/datausage/DataUsageList.kt
@@ -29,7 +29,7 @@ import androidx.annotation.OpenForTesting
import androidx.annotation.VisibleForTesting
import androidx.fragment.app.viewModels
import androidx.preference.Preference
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.dashboard.DashboardFragment
import com.android.settings.datausage.lib.BillingCycleRepository
import com.android.settings.datausage.lib.NetworkUsageData
diff --git a/Settings/src/com/android/settings/datausage/DataUsageListAppsController.kt b/Settings/src/com/android/settings/datausage/DataUsageListAppsController.kt
index 93623f47..3edfbed7 100644
--- a/Settings/src/com/android/settings/datausage/DataUsageListAppsController.kt
+++ b/Settings/src/com/android/settings/datausage/DataUsageListAppsController.kt
@@ -27,7 +27,7 @@ import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceGroup
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settings.core.SubSettingLauncher
import com.android.settings.datausage.lib.AppDataUsageRepository
diff --git a/Settings/src/com/android/settings/datausage/DataUsageListHeaderController.kt b/Settings/src/com/android/settings/datausage/DataUsageListHeaderController.kt
index ade891a0..d95535f7 100644
--- a/Settings/src/com/android/settings/datausage/DataUsageListHeaderController.kt
+++ b/Settings/src/com/android/settings/datausage/DataUsageListHeaderController.kt
@@ -25,7 +25,7 @@ import android.widget.AdapterView
import android.widget.Spinner
import androidx.annotation.OpenForTesting
import androidx.lifecycle.LifecycleOwner
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.SubSettingLauncher
import com.android.settings.datausage.CycleAdapter.SpinnerInterface
import com.android.settings.datausage.lib.NetworkUsageData
diff --git a/Settings/src/com/android/settings/datausage/DataUsagePreference.java b/Settings/src/com/android/settings/datausage/DataUsagePreference.java
index 07368c72..946dc829 100644
--- a/Settings/src/com/android/settings/datausage/DataUsagePreference.java
+++ b/Settings/src/com/android/settings/datausage/DataUsagePreference.java
@@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.net.DataUsageController;
diff --git a/Settings/src/com/android/settings/datausage/DataUsageSummary.java b/Settings/src/com/android/settings/datausage/DataUsageSummary.java
index 5681c922..f0656031 100644
--- a/Settings/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/Settings/src/com/android/settings/datausage/DataUsageSummary.java
@@ -35,7 +35,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.datausage.lib.DataUsageLib;
import com.android.settings.network.ProxySubscriptionManager;
diff --git a/Settings/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/Settings/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 93d930c5..b45cb0c1 100644
--- a/Settings/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/Settings/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -37,7 +37,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.kt b/Settings/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.kt
index 8b31f675..3d5044a8 100644
--- a/Settings/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.kt
+++ b/Settings/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.kt
@@ -26,7 +26,7 @@ import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.datausage.lib.DataUsageLib.getMobileTemplate
import com.android.settings.datausage.lib.INetworkCycleDataRepository
import com.android.settings.datausage.lib.NetworkCycleDataRepository
diff --git a/Settings/src/com/android/settings/datausage/SpinnerPreference.java b/Settings/src/com/android/settings/datausage/SpinnerPreference.java
index febdead8..4b96e325 100644
--- a/Settings/src/com/android/settings/datausage/SpinnerPreference.java
+++ b/Settings/src/com/android/settings/datausage/SpinnerPreference.java
@@ -24,7 +24,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface {
diff --git a/Settings/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/Settings/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index 05c11327..688dccd3 100644
--- a/Settings/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/Settings/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -22,7 +22,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.applications.AppIconCacheManager;
diff --git a/Settings/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/Settings/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
index b3e66a9c..b69f4e09 100644
--- a/Settings/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
+++ b/Settings/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
@@ -25,7 +25,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
diff --git a/Settings/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/Settings/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
index 0fb30a8e..c41c02c4 100644
--- a/Settings/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
+++ b/Settings/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt b/Settings/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt
index 5abde318..7a6e1df1 100644
--- a/Settings/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt
+++ b/Settings/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt
@@ -28,7 +28,7 @@ import android.util.SparseArray
import android.util.SparseBooleanArray
import androidx.annotation.VisibleForTesting
import androidx.core.util.keyIterator
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.Bucket
import com.android.settingslib.AppItem
import com.android.settingslib.net.UidDetailProvider
diff --git a/Settings/src/com/android/settings/datausage/lib/NetworkTemplates.kt b/Settings/src/com/android/settings/datausage/lib/NetworkTemplates.kt
index 90200706..f4319706 100644
--- a/Settings/src/com/android/settings/datausage/lib/NetworkTemplates.kt
+++ b/Settings/src/com/android/settings/datausage/lib/NetworkTemplates.kt
@@ -20,7 +20,7 @@ import android.content.Context
import android.net.NetworkTemplate
import android.telephony.SubscriptionManager
import androidx.annotation.StringRes
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.datausage.DataUsageUtils
interface INetworkTemplates {
diff --git a/Settings/src/com/android/settings/datausage/lib/NetworkUsageData.kt b/Settings/src/com/android/settings/datausage/lib/NetworkUsageData.kt
index f9d83d52..115b377e 100644
--- a/Settings/src/com/android/settings/datausage/lib/NetworkUsageData.kt
+++ b/Settings/src/com/android/settings/datausage/lib/NetworkUsageData.kt
@@ -19,7 +19,7 @@ package com.android.settings.datausage.lib
import android.content.Context
import android.text.format.DateUtils
import android.util.Range
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.datausage.DataUsageUtils
/**
diff --git a/Settings/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java b/Settings/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
index 44e7cc63..cadbe889 100644
--- a/Settings/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import android.provider.Settings.System;
import android.text.format.DateFormat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import java.util.Locale;
diff --git a/Settings/src/com/android/settings/datetime/AutoTimePreferenceController.java b/Settings/src/com/android/settings/datetime/AutoTimePreferenceController.java
index 434eba96..d7eb63bc 100644
--- a/Settings/src/com/android/settings/datetime/AutoTimePreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/AutoTimePreferenceController.java
@@ -28,7 +28,7 @@ import android.app.time.TimeManager;
import android.content.Context;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class AutoTimePreferenceController extends TogglePreferenceController {
diff --git a/Settings/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/Settings/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
index 011cc971..012ac050 100644
--- a/Settings/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
@@ -28,7 +28,7 @@ import android.app.time.TimeZoneConfiguration;
import android.content.Context;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class AutoTimeZonePreferenceController extends TogglePreferenceController {
diff --git a/Settings/src/com/android/settings/datetime/DateTimeSettings.java b/Settings/src/com/android/settings/datetime/DateTimeSettings.java
index fb1dd196..b04a5b13 100644
--- a/Settings/src/com/android/settings/datetime/DateTimeSettings.java
+++ b/Settings/src/com/android/settings/datetime/DateTimeSettings.java
@@ -21,7 +21,7 @@ import android.app.settings.SettingsEnums;
import android.app.timedetector.TimeDetectorHelper;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/datetime/LocationProviderStatusPreferenceController.java b/Settings/src/com/android/settings/datetime/LocationProviderStatusPreferenceController.java
index f45fe880..886a96ad 100644
--- a/Settings/src/com/android/settings/datetime/LocationProviderStatusPreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/LocationProviderStatusPreferenceController.java
@@ -32,7 +32,7 @@ import android.text.TextUtils;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.location.LocationSettings;
diff --git a/Settings/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/Settings/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
index a50ce4c3..00835359 100644
--- a/Settings/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -29,7 +29,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/datetime/LocationToggleDisabledDialogFragment.java b/Settings/src/com/android/settings/datetime/LocationToggleDisabledDialogFragment.java
index 046a659d..a600cb64 100644
--- a/Settings/src/com/android/settings/datetime/LocationToggleDisabledDialogFragment.java
+++ b/Settings/src/com/android/settings/datetime/LocationToggleDisabledDialogFragment.java
@@ -23,7 +23,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/Settings/src/com/android/settings/datetime/TimeFormatPreferenceController.java
index 22f7509f..a61ba1d6 100644
--- a/Settings/src/com/android/settings/datetime/TimeFormatPreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/TimeFormatPreferenceController.java
@@ -23,7 +23,7 @@ import android.text.format.DateFormat;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import java.util.Calendar;
diff --git a/Settings/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java b/Settings/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
index 66735c8a..59243a02 100644
--- a/Settings/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
+++ b/Settings/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.annotation.WorkerThread;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.datetime.timezone.BaseTimeZonePicker.OnListItemClickListener;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java b/Settings/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
index 1ed85167..aec58140 100644
--- a/Settings/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
+++ b/Settings/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
@@ -26,7 +26,7 @@ import android.icu.util.Calendar;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.datetime.timezone.model.TimeZoneData;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/Settings/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
index adbedee7..0fdddbf7 100644
--- a/Settings/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
+++ b/Settings/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
@@ -34,7 +34,7 @@ import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.datetime.timezone.model.TimeZoneData;
import com.android.settings.datetime.timezone.model.TimeZoneDataLoader;
diff --git a/Settings/src/com/android/settings/datetime/timezone/FixedOffsetPicker.java b/Settings/src/com/android/settings/datetime/timezone/FixedOffsetPicker.java
index a0431cc7..83a93ccd 100644
--- a/Settings/src/com/android/settings/datetime/timezone/FixedOffsetPicker.java
+++ b/Settings/src/com/android/settings/datetime/timezone/FixedOffsetPicker.java
@@ -19,7 +19,7 @@ package com.android.settings.datetime.timezone;
import android.app.settings.SettingsEnums;
import android.icu.util.TimeZone;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.datetime.timezone.model.TimeZoneData;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceController.java b/Settings/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceController.java
index 234e7db7..58e3e4ff 100644
--- a/Settings/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.datetime.timezone;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class FixedOffsetPreferenceController extends BaseTimeZonePreferenceController {
diff --git a/Settings/src/com/android/settings/datetime/timezone/RegionSearchPicker.java b/Settings/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
index 3977aa90..3389ca81 100644
--- a/Settings/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
+++ b/Settings/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones;
diff --git a/Settings/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/Settings/src/com/android/settings/datetime/timezone/RegionZonePicker.java
index 1bc68a10..4154eee5 100644
--- a/Settings/src/com/android/settings/datetime/timezone/RegionZonePicker.java
+++ b/Settings/src/com/android/settings/datetime/timezone/RegionZonePicker.java
@@ -29,7 +29,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones;
import com.android.settings.datetime.timezone.model.TimeZoneData;
diff --git a/Settings/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java b/Settings/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java
index a297ce60..bba14089 100644
--- a/Settings/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class RegionZonePreferenceController extends BaseTimeZonePreferenceController {
private static final String PREFERENCE_KEY = "region_zone";
diff --git a/Settings/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/Settings/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
index fb2392b9..f25f51c9 100644
--- a/Settings/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
+++ b/Settings/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
@@ -26,7 +26,7 @@ import android.icu.util.TimeZone;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.time.Instant;
diff --git a/Settings/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/Settings/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
index 6c779b54..9d4397df 100644
--- a/Settings/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
+++ b/Settings/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
@@ -34,7 +34,7 @@ import android.view.MenuItem;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones;
diff --git a/Settings/src/com/android/settings/deletionhelper/ActivationWarningFragment.java b/Settings/src/com/android/settings/deletionhelper/ActivationWarningFragment.java
index 8e3f8cab..89d22aa4 100644
--- a/Settings/src/com/android/settings/deletionhelper/ActivationWarningFragment.java
+++ b/Settings/src/com/android/settings/deletionhelper/ActivationWarningFragment.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Fragment to warn the user about activating the storage manager.
diff --git a/Settings/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/Settings/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
index 4cd79495..2a6476a2 100644
--- a/Settings/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
+++ b/Settings/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
@@ -21,7 +21,7 @@ import android.text.format.Formatter;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/Settings/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index a36d9edc..9f7bcb2a 100644
--- a/Settings/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/Settings/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -29,7 +29,7 @@ import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/development/AdbDeviceDetailsActionController.java b/Settings/src/com/android/settings/development/AdbDeviceDetailsActionController.java
index 1faf36f3..01a246de 100644
--- a/Settings/src/com/android/settings/development/AdbDeviceDetailsActionController.java
+++ b/Settings/src/com/android/settings/development/AdbDeviceDetailsActionController.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.ActionButtonsPreference;
diff --git a/Settings/src/com/android/settings/development/AdbDeviceDetailsFragment.java b/Settings/src/com/android/settings/development/AdbDeviceDetailsFragment.java
index 98613452..421417dd 100644
--- a/Settings/src/com/android/settings/development/AdbDeviceDetailsFragment.java
+++ b/Settings/src/com/android/settings/development/AdbDeviceDetailsFragment.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.debug.PairDevice;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java b/Settings/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
index 1bb4f3cb..cba6cc6e 100644
--- a/Settings/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
+++ b/Settings/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
@@ -22,7 +22,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/development/AdbPairedDevicePreference.java b/Settings/src/com/android/settings/development/AdbPairedDevicePreference.java
index 9cc85bc5..bb15f44e 100644
--- a/Settings/src/com/android/settings/development/AdbPairedDevicePreference.java
+++ b/Settings/src/com/android/settings/development/AdbPairedDevicePreference.java
@@ -24,7 +24,7 @@ import android.view.View;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* An AP preference for the currently connected AP
diff --git a/Settings/src/com/android/settings/development/AdbQrCodeActivity.java b/Settings/src/com/android/settings/development/AdbQrCodeActivity.java
index bab20f97..f7a21cc9 100644
--- a/Settings/src/com/android/settings/development/AdbQrCodeActivity.java
+++ b/Settings/src/com/android/settings/development/AdbQrCodeActivity.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import androidx.fragment.app.FragmentTransaction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.wifi.dpp.WifiDppBaseActivity;
/**
diff --git a/Settings/src/com/android/settings/development/AdbQrcodeScannerFragment.java b/Settings/src/com/android/settings/development/AdbQrcodeScannerFragment.java
index ca44747f..76baffad 100644
--- a/Settings/src/com/android/settings/development/AdbQrcodeScannerFragment.java
+++ b/Settings/src/com/android/settings/development/AdbQrcodeScannerFragment.java
@@ -43,7 +43,7 @@ import android.widget.TextView;
import androidx.annotation.StringRes;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.wifi.dpp.AdbQrCode;
import com.android.settings.wifi.dpp.WifiDppQrCodeBaseFragment;
diff --git a/Settings/src/com/android/settings/development/AdbWirelessDialog.java b/Settings/src/com/android/settings/development/AdbWirelessDialog.java
index 48884b93..62d3b226 100644
--- a/Settings/src/com/android/settings/development/AdbWirelessDialog.java
+++ b/Settings/src/com/android/settings/development/AdbWirelessDialog.java
@@ -24,7 +24,7 @@ import android.widget.Button;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Class to show a variety of dialogs for the Wireless debugging
diff --git a/Settings/src/com/android/settings/development/AdbWirelessDialogController.java b/Settings/src/com/android/settings/development/AdbWirelessDialogController.java
index 35471b99..802a6379 100644
--- a/Settings/src/com/android/settings/development/AdbWirelessDialogController.java
+++ b/Settings/src/com/android/settings/development/AdbWirelessDialogController.java
@@ -21,7 +21,7 @@ import android.content.res.Resources;
import android.view.View;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* The class for allowing UIs like {@link AdbWirelessDialog} and {@link AdbWirelessDialogUiBase} to
diff --git a/Settings/src/com/android/settings/development/BluetoothLeAudioModePreferenceController.java b/Settings/src/com/android/settings/development/BluetoothLeAudioModePreferenceController.java
index 06cfe650..32806c32 100644
--- a/Settings/src/com/android/settings/development/BluetoothLeAudioModePreferenceController.java
+++ b/Settings/src/com/android/settings/development/BluetoothLeAudioModePreferenceController.java
@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/BluetoothRebootDialog.java b/Settings/src/com/android/settings/development/BluetoothRebootDialog.java
index 90f4c0c5..ecf918f2 100644
--- a/Settings/src/com/android/settings/development/BluetoothRebootDialog.java
+++ b/Settings/src/com/android/settings/development/BluetoothRebootDialog.java
@@ -25,7 +25,7 @@ import android.os.PowerManager;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java b/Settings/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java
index 607b672b..25f2638e 100644
--- a/Settings/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java
+++ b/Settings/src/com/android/settings/development/BluetoothSnoopLogFilterProfileMapPreferenceController.java
@@ -23,7 +23,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java b/Settings/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java
index 18160110..2a72c65e 100644
--- a/Settings/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java
+++ b/Settings/src/com/android/settings/development/BluetoothSnoopLogFilterProfilePbapPreferenceController.java
@@ -23,7 +23,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/BugReportHandlerPreferenceController.java b/Settings/src/com/android/settings/development/BugReportHandlerPreferenceController.java
index f1545371..566859cf 100644
--- a/Settings/src/com/android/settings/development/BugReportHandlerPreferenceController.java
+++ b/Settings/src/com/android/settings/development/BugReportHandlerPreferenceController.java
@@ -25,7 +25,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bugreporthandler.BugReportHandlerUtil;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/Settings/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
index 0a9600ab..0946879c 100644
--- a/Settings/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
+++ b/Settings/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/Settings/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
index 82964e7c..c43bb1cb 100644
--- a/Settings/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
+++ b/Settings/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
diff --git a/Settings/src/com/android/settings/development/DSULoader.java b/Settings/src/com/android/settings/development/DSULoader.java
index fede67a7..f63f5bde 100644
--- a/Settings/src/com/android/settings/development/DSULoader.java
+++ b/Settings/src/com/android/settings/development/DSULoader.java
@@ -31,7 +31,7 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ListView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/Settings/src/com/android/settings/development/DSUTermsOfServiceActivity.java b/Settings/src/com/android/settings/development/DSUTermsOfServiceActivity.java
index f88d4efe..fb5bf90c 100644
--- a/Settings/src/com/android/settings/development/DSUTermsOfServiceActivity.java
+++ b/Settings/src/com/android/settings/development/DSUTermsOfServiceActivity.java
@@ -24,7 +24,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Activity shows terms of service for a given DSU package */
public class DSUTermsOfServiceActivity extends Activity {
diff --git a/Settings/src/com/android/settings/development/DesktopModePreferenceController.java b/Settings/src/com/android/settings/development/DesktopModePreferenceController.java
index dcd0c140..f420a952 100644
--- a/Settings/src/com/android/settings/development/DesktopModePreferenceController.java
+++ b/Settings/src/com/android/settings/development/DesktopModePreferenceController.java
@@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/DevelopmentAppPicker.java b/Settings/src/com/android/settings/development/DevelopmentAppPicker.java
index 7ef0869b..e76d8949 100644
--- a/Settings/src/com/android/settings/development/DevelopmentAppPicker.java
+++ b/Settings/src/com/android/settings/development/DevelopmentAppPicker.java
@@ -29,7 +29,7 @@ import android.os.Bundle;
import android.os.Process;
import android.os.UserHandle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
diff --git a/Settings/src/com/android/settings/development/DevelopmentMemtagFooterPreferenceController.java b/Settings/src/com/android/settings/development/DevelopmentMemtagFooterPreferenceController.java
index a5612ca8..d30095aa 100644
--- a/Settings/src/com/android/settings/development/DevelopmentMemtagFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/development/DevelopmentMemtagFooterPreferenceController.java
@@ -21,7 +21,7 @@ import android.text.TextUtils;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/development/DevelopmentMemtagPage.java b/Settings/src/com/android/settings/development/DevelopmentMemtagPage.java
index df983f3d..bd40c5c1 100644
--- a/Settings/src/com/android/settings/development/DevelopmentMemtagPage.java
+++ b/Settings/src/com/android/settings/development/DevelopmentMemtagPage.java
@@ -19,7 +19,7 @@ package com.android.settings.development;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/development/DevelopmentMemtagPreferenceController.java b/Settings/src/com/android/settings/development/DevelopmentMemtagPreferenceController.java
index c73c717a..70fdcac7 100644
--- a/Settings/src/com/android/settings/development/DevelopmentMemtagPreferenceController.java
+++ b/Settings/src/com/android/settings/development/DevelopmentMemtagPreferenceController.java
@@ -24,7 +24,7 @@ import android.os.SystemProperties;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/Settings/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index cfa4a589..85220d5a 100644
--- a/Settings/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/Settings/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -53,7 +53,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/development/DisableDevSettingsDialogFragment.java b/Settings/src/com/android/settings/development/DisableDevSettingsDialogFragment.java
index 4355f277..21467eb9 100644
--- a/Settings/src/com/android/settings/development/DisableDevSettingsDialogFragment.java
+++ b/Settings/src/com/android/settings/development/DisableDevSettingsDialogFragment.java
@@ -28,7 +28,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ProcessStatsSummary;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/development/Enable16kPagesPreferenceController.java b/Settings/src/com/android/settings/development/Enable16kPagesPreferenceController.java
index 3f9da578..fb94e160 100644
--- a/Settings/src/com/android/settings/development/Enable16kPagesPreferenceController.java
+++ b/Settings/src/com/android/settings/development/Enable16kPagesPreferenceController.java
@@ -41,7 +41,7 @@ import androidx.core.content.ContextCompat;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/Enable16kPagesWarningDialog.java b/Settings/src/com/android/settings/development/Enable16kPagesWarningDialog.java
index 5c27b3f5..2cb60541 100644
--- a/Settings/src/com/android/settings/development/Enable16kPagesWarningDialog.java
+++ b/Settings/src/com/android/settings/development/Enable16kPagesWarningDialog.java
@@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/** Dialog when user interacts 16K pages developer option */
diff --git a/Settings/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java b/Settings/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
index 0375acc0..d6ed0b96 100644
--- a/Settings/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
+++ b/Settings/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
@@ -25,7 +25,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragment implements
diff --git a/Settings/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java b/Settings/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
index 455f74f8..f30770a7 100644
--- a/Settings/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
+++ b/Settings/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.server.display.feature.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/Settings/src/com/android/settings/development/FreeformWindowsPreferenceController.java
index 872c0465..bc5eb8ee 100644
--- a/Settings/src/com/android/settings/development/FreeformWindowsPreferenceController.java
+++ b/Settings/src/com/android/settings/development/FreeformWindowsPreferenceController.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/GameDefaultFrameRatePreferenceController.java b/Settings/src/com/android/settings/development/GameDefaultFrameRatePreferenceController.java
index 00001fb4..1b859cf0 100644
--- a/Settings/src/com/android/settings/development/GameDefaultFrameRatePreferenceController.java
+++ b/Settings/src/com/android/settings/development/GameDefaultFrameRatePreferenceController.java
@@ -27,7 +27,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.flags.Flags;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/MemoryUsagePreferenceController.java b/Settings/src/com/android/settings/development/MemoryUsagePreferenceController.java
index ca8effa4..df03f66a 100644
--- a/Settings/src/com/android/settings/development/MemoryUsagePreferenceController.java
+++ b/Settings/src/com/android/settings/development/MemoryUsagePreferenceController.java
@@ -25,7 +25,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.ProcStatsData;
import com.android.settings.applications.ProcessStatsBase;
import com.android.settings.core.PreferenceControllerMixin;
diff --git a/Settings/src/com/android/settings/development/NfcRebootDialog.java b/Settings/src/com/android/settings/development/NfcRebootDialog.java
index 7d9890ee..95f49451 100644
--- a/Settings/src/com/android/settings/development/NfcRebootDialog.java
+++ b/Settings/src/com/android/settings/development/NfcRebootDialog.java
@@ -25,7 +25,7 @@ import android.os.PowerManager;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/development/OemLockInfoDialog.java b/Settings/src/com/android/settings/development/OemLockInfoDialog.java
index c540daae..b63cbbfe 100644
--- a/Settings/src/com/android/settings/development/OemLockInfoDialog.java
+++ b/Settings/src/com/android/settings/development/OemLockInfoDialog.java
@@ -24,7 +24,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class OemLockInfoDialog extends InstrumentedDialogFragment {
diff --git a/Settings/src/com/android/settings/development/OemUnlockPreferenceController.java b/Settings/src/com/android/settings/development/OemUnlockPreferenceController.java
index 9076f9a9..e0f666d3 100644
--- a/Settings/src/com/android/settings/development/OemUnlockPreferenceController.java
+++ b/Settings/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -34,7 +34,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/src/com/android/settings/development/OverlayCategoryPreferenceController.java b/Settings/src/com/android/settings/development/OverlayCategoryPreferenceController.java
index ce51b54c..1197da00 100644
--- a/Settings/src/com/android/settings/development/OverlayCategoryPreferenceController.java
+++ b/Settings/src/com/android/settings/development/OverlayCategoryPreferenceController.java
@@ -34,7 +34,7 @@ import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/RebootConfirmationDialogFragment.java b/Settings/src/com/android/settings/development/RebootConfirmationDialogFragment.java
index 45c36976..6b3fe5f3 100644
--- a/Settings/src/com/android/settings/development/RebootConfirmationDialogFragment.java
+++ b/Settings/src/com/android/settings/development/RebootConfirmationDialogFragment.java
@@ -25,7 +25,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/** Dialog fragment for reboot confirmation when enabling certain features. */
diff --git a/Settings/src/com/android/settings/development/RebootWithMteDialog.java b/Settings/src/com/android/settings/development/RebootWithMteDialog.java
index 858cd8f1..e8c73b3b 100644
--- a/Settings/src/com/android/settings/development/RebootWithMteDialog.java
+++ b/Settings/src/com/android/settings/development/RebootWithMteDialog.java
@@ -28,7 +28,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class RebootWithMteDialog extends InstrumentedDialogFragment
diff --git a/Settings/src/com/android/settings/development/RebootWithMtePreferenceController.java b/Settings/src/com/android/settings/development/RebootWithMtePreferenceController.java
index 76ad2ce3..c3281a8e 100644
--- a/Settings/src/com/android/settings/development/RebootWithMtePreferenceController.java
+++ b/Settings/src/com/android/settings/development/RebootWithMtePreferenceController.java
@@ -23,7 +23,7 @@ import android.text.TextUtils;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
diff --git a/Settings/src/com/android/settings/development/SelectDSUPreferenceController.java b/Settings/src/com/android/settings/development/SelectDSUPreferenceController.java
index 425cdb3d..14be7ab5 100644
--- a/Settings/src/com/android/settings/development/SelectDSUPreferenceController.java
+++ b/Settings/src/com/android/settings/development/SelectDSUPreferenceController.java
@@ -22,7 +22,7 @@ import android.os.SystemProperties;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/Settings/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
index 05ddf3ab..81234442 100644
--- a/Settings/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
+++ b/Settings/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
@@ -26,7 +26,7 @@ import android.widget.Toast;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/SystemServerHeapDumpPreferenceController.java b/Settings/src/com/android/settings/development/SystemServerHeapDumpPreferenceController.java
index e6701ce2..931ff33b 100644
--- a/Settings/src/com/android/settings/development/SystemServerHeapDumpPreferenceController.java
+++ b/Settings/src/com/android/settings/development/SystemServerHeapDumpPreferenceController.java
@@ -28,7 +28,7 @@ import android.widget.Toast;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/WebViewAppPreferenceController.java b/Settings/src/com/android/settings/development/WebViewAppPreferenceController.java
index 37653ccf..fcb151d4 100644
--- a/Settings/src/com/android/settings/development/WebViewAppPreferenceController.java
+++ b/Settings/src/com/android/settings/development/WebViewAppPreferenceController.java
@@ -26,7 +26,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
import com.android.settingslib.applications.DefaultAppInfo;
diff --git a/Settings/src/com/android/settings/development/WirelessDebuggingFragment.java b/Settings/src/com/android/settings/development/WirelessDebuggingFragment.java
index 8be8d913..e06de551 100644
--- a/Settings/src/com/android/settings/development/WirelessDebuggingFragment.java
+++ b/Settings/src/com/android/settings/development/WirelessDebuggingFragment.java
@@ -37,7 +37,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java b/Settings/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java
index f955f5e0..5fa2dd19 100644
--- a/Settings/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java
+++ b/Settings/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java
@@ -25,7 +25,7 @@ import android.view.autofill.AutofillManager;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java b/Settings/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java
index d30d0bb2..bbc08541 100644
--- a/Settings/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java
+++ b/Settings/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java
@@ -25,7 +25,7 @@ import android.widget.Toast;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
diff --git a/Settings/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java b/Settings/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
index b0c60a83..44a8640e 100644
--- a/Settings/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
+++ b/Settings/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
@@ -24,7 +24,7 @@ import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.CustomDialogPreferenceCompat;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java b/Settings/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java
index 99eb7302..e90f85e5 100644
--- a/Settings/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java
+++ b/Settings/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreference.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.widget.RadioGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Dialog preference to set the Bluetooth A2DP config of bit per sample
diff --git a/Settings/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java b/Settings/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java
index 4a4191a4..c6f54a71 100644
--- a/Settings/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java
+++ b/Settings/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreference.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.widget.RadioGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Dialog preference to set the Bluetooth A2DP config of audio channel mode
diff --git a/Settings/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java b/Settings/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java
index 11cfd341..e23824b1 100644
--- a/Settings/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java
+++ b/Settings/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.widget.RadioGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Dialog preference to set the Bluetooth A2DP config of codec
diff --git a/Settings/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java b/Settings/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java
index 796cbe8e..87ff0d0b 100644
--- a/Settings/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java
+++ b/Settings/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreference.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.widget.RadioGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Dialog preference to set the Bluetooth A2DP config of LDAC quality
diff --git a/Settings/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java b/Settings/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java
index 71eda790..5a238d7b 100644
--- a/Settings/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java
+++ b/Settings/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreference.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.widget.RadioGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Dialog preference to set the Bluetooth A2DP config of sample rate
diff --git a/Settings/src/com/android/settings/development/compat/PlatformCompatDashboard.java b/Settings/src/com/android/settings/development/compat/PlatformCompatDashboard.java
index 05159c7a..472f01cf 100644
--- a/Settings/src/com/android/settings/development/compat/PlatformCompatDashboard.java
+++ b/Settings/src/com/android/settings/development/compat/PlatformCompatDashboard.java
@@ -39,7 +39,7 @@ import androidx.preference.TwoStatePreference;
import com.android.internal.compat.CompatibilityChangeConfig;
import com.android.internal.compat.CompatibilityChangeInfo;
import com.android.internal.compat.IPlatformCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/Settings/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
index 0483dce7..9dcbff8d 100644
--- a/Settings/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
+++ b/Settings/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
diff --git a/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java b/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
index 46a30827..c2085a6f 100644
--- a/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
+++ b/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
@@ -34,7 +34,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java b/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
index 87678f96..779c7a4b 100644
--- a/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
+++ b/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java b/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
index e75ab1a5..ba0c3beb 100644
--- a/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
+++ b/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
@@ -27,7 +27,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.development.DevelopmentSettingsDashboardFragment;
import com.android.settings.development.RebootConfirmationDialogFragment;
diff --git a/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java b/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
index c5bf79f8..194bf41e 100644
--- a/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/Settings/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
index 0ca189d9..ed1156c8 100644
--- a/Settings/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
+++ b/Settings/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
@@ -23,7 +23,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.os.SystemProperties;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/development/quarantine/QuarantinedAppPreference.java b/Settings/src/com/android/settings/development/quarantine/QuarantinedAppPreference.java
index 6ad1f86f..56fffa1f 100644
--- a/Settings/src/com/android/settings/development/quarantine/QuarantinedAppPreference.java
+++ b/Settings/src/com/android/settings/development/quarantine/QuarantinedAppPreference.java
@@ -21,7 +21,7 @@ import android.graphics.drawable.Drawable;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.utils.ThreadUtils;
diff --git a/Settings/src/com/android/settings/development/quarantine/QuarantinedAppsFragment.java b/Settings/src/com/android/settings/development/quarantine/QuarantinedAppsFragment.java
index 985e9628..8e0b731a 100644
--- a/Settings/src/com/android/settings/development/quarantine/QuarantinedAppsFragment.java
+++ b/Settings/src/com/android/settings/development/quarantine/QuarantinedAppsFragment.java
@@ -27,7 +27,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.SearchView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.applications.AppIconCacheManager;
diff --git a/Settings/src/com/android/settings/development/quarantine/QuarantinedAppsScreenController.java b/Settings/src/com/android/settings/development/quarantine/QuarantinedAppsScreenController.java
index 4d4834b6..caaed9ad 100644
--- a/Settings/src/com/android/settings/development/quarantine/QuarantinedAppsScreenController.java
+++ b/Settings/src/com/android/settings/development/quarantine/QuarantinedAppsScreenController.java
@@ -27,7 +27,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.applications.AppUtils;
diff --git a/Settings/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersDashboard.java b/Settings/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersDashboard.java
index 6f1ede25..d9cddb81 100644
--- a/Settings/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersDashboard.java
+++ b/Settings/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersDashboard.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/development/storage/BlobInfoListView.java b/Settings/src/com/android/settings/development/storage/BlobInfoListView.java
index 36d6c7a7..c766b52c 100644
--- a/Settings/src/com/android/settings/development/storage/BlobInfoListView.java
+++ b/Settings/src/com/android/settings/development/storage/BlobInfoListView.java
@@ -36,7 +36,7 @@ import android.widget.Toast;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.util.CollectionUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.io.IOException;
import java.util.List;
diff --git a/Settings/src/com/android/settings/development/storage/BlobInfoViewHolder.java b/Settings/src/com/android/settings/development/storage/BlobInfoViewHolder.java
index 073a138f..fa7865e6 100644
--- a/Settings/src/com/android/settings/development/storage/BlobInfoViewHolder.java
+++ b/Settings/src/com/android/settings/development/storage/BlobInfoViewHolder.java
@@ -20,7 +20,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* View holder for {@link BlobInfoListView}.
diff --git a/Settings/src/com/android/settings/development/storage/LeaseInfoListView.java b/Settings/src/com/android/settings/development/storage/LeaseInfoListView.java
index bc971194..4b6b7334 100644
--- a/Settings/src/com/android/settings/development/storage/LeaseInfoListView.java
+++ b/Settings/src/com/android/settings/development/storage/LeaseInfoListView.java
@@ -42,7 +42,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.util.CollectionUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.io.IOException;
import java.util.List;
diff --git a/Settings/src/com/android/settings/development/storage/LeaseInfoViewHolder.java b/Settings/src/com/android/settings/development/storage/LeaseInfoViewHolder.java
index 66b37ec6..5c9b0897 100644
--- a/Settings/src/com/android/settings/development/storage/LeaseInfoViewHolder.java
+++ b/Settings/src/com/android/settings/development/storage/LeaseInfoViewHolder.java
@@ -21,7 +21,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* View holder for {@link LeaseInfoListView}.
diff --git a/Settings/src/com/android/settings/development/tare/AlarmManagerFragment.java b/Settings/src/com/android/settings/development/tare/AlarmManagerFragment.java
index b55c7cf3..26df935c 100644
--- a/Settings/src/com/android/settings/development/tare/AlarmManagerFragment.java
+++ b/Settings/src/com/android/settings/development/tare/AlarmManagerFragment.java
@@ -27,7 +27,7 @@ import android.widget.ExpandableListView.OnChildClickListener;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Creates the AlarmManager fragment to display all the AlarmManager factors
diff --git a/Settings/src/com/android/settings/development/tare/DropdownActivity.java b/Settings/src/com/android/settings/development/tare/DropdownActivity.java
index 66b57dd3..c6e97856 100644
--- a/Settings/src/com/android/settings/development/tare/DropdownActivity.java
+++ b/Settings/src/com/android/settings/development/tare/DropdownActivity.java
@@ -25,7 +25,7 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Spinner;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.SettingsSpinnerAdapter;
/**
diff --git a/Settings/src/com/android/settings/development/tare/JobSchedulerFragment.java b/Settings/src/com/android/settings/development/tare/JobSchedulerFragment.java
index 7f5e6638..8eb8f344 100644
--- a/Settings/src/com/android/settings/development/tare/JobSchedulerFragment.java
+++ b/Settings/src/com/android/settings/development/tare/JobSchedulerFragment.java
@@ -27,7 +27,7 @@ import android.widget.ExpandableListView.OnChildClickListener;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Creates the JobScheduler fragment to display all the JobScheduler factors
diff --git a/Settings/src/com/android/settings/development/tare/TareFactorController.java b/Settings/src/com/android/settings/development/tare/TareFactorController.java
index 3407b7b8..fc25d152 100644
--- a/Settings/src/com/android/settings/development/tare/TareFactorController.java
+++ b/Settings/src/com/android/settings/development/tare/TareFactorController.java
@@ -41,7 +41,7 @@ import android.util.Slog;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Takes an AlarmManager or JobScheduler csv string and parses it to get key:value pairs.
diff --git a/Settings/src/com/android/settings/development/tare/TareFactorDialogFragment.java b/Settings/src/com/android/settings/development/tare/TareFactorDialogFragment.java
index 269e2094..fe27b53c 100644
--- a/Settings/src/com/android/settings/development/tare/TareFactorDialogFragment.java
+++ b/Settings/src/com/android/settings/development/tare/TareFactorDialogFragment.java
@@ -34,7 +34,7 @@ import android.widget.Spinner;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
/**
diff --git a/Settings/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java b/Settings/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java
index 9c78d068..6bd4ff7a 100644
--- a/Settings/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java
+++ b/Settings/src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java
@@ -27,7 +27,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Creates the expandable list that will allow modifying individual factors.
diff --git a/Settings/src/com/android/settings/development/tare/TareHomePage.java b/Settings/src/com/android/settings/development/tare/TareHomePage.java
index 0eb93fc9..2a93ace5 100644
--- a/Settings/src/com/android/settings/development/tare/TareHomePage.java
+++ b/Settings/src/com/android/settings/development/tare/TareHomePage.java
@@ -38,7 +38,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.TextView;
import android.widget.Toast;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Class for creating the TARE homepage in settings */
public class TareHomePage extends Activity {
diff --git a/Settings/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java b/Settings/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
index a12aa642..d2318fb3 100644
--- a/Settings/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
+++ b/Settings/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.development.transcode;
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java b/Settings/src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java
index 8229c98b..d12cadcf 100644
--- a/Settings/src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java
+++ b/Settings/src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.os.SystemProperties;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java b/Settings/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
index 63572f71..88141e5d 100644
--- a/Settings/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.development.transcode;
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java b/Settings/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
index 11c9c743..dc89c1ce 100644
--- a/Settings/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.os.SystemProperties;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java b/Settings/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java
index e3dc9bfc..2c381a96 100644
--- a/Settings/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java
+++ b/Settings/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.development.transcode;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java b/Settings/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java
index 377ff26d..16f32a64 100644
--- a/Settings/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java
+++ b/Settings/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.development.transcode;
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/development/widevine/ForceL3FallbackPreferenceController.java b/Settings/src/com/android/settings/development/widevine/ForceL3FallbackPreferenceController.java
index 78468c19..44d27fa3 100644
--- a/Settings/src/com/android/settings/development/widevine/ForceL3FallbackPreferenceController.java
+++ b/Settings/src/com/android/settings/development/widevine/ForceL3FallbackPreferenceController.java
@@ -23,7 +23,7 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settings.media_drm.Flags;
diff --git a/Settings/src/com/android/settings/development/widevine/WidevineSettingsFragment.java b/Settings/src/com/android/settings/development/widevine/WidevineSettingsFragment.java
index 058aa40e..1a855178 100644
--- a/Settings/src/com/android/settings/development/widevine/WidevineSettingsFragment.java
+++ b/Settings/src/com/android/settings/development/widevine/WidevineSettingsFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.development.widevine;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
diff --git a/Settings/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
index 13aac5c7..a00fae4d 100644
--- a/Settings/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accounts.AccountDashboardFragment;
import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index 6fe3ca45..d529ed99 100644
--- a/Settings/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -34,7 +34,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.InstrumentedPreferenceFragment;
diff --git a/Settings/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/Settings/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
index e6d9dfdb..44521597 100644
--- a/Settings/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
@@ -29,7 +29,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.ValidatedEditTextPreference;
diff --git a/Settings/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
index 1150838d..8c5ee740 100644
--- a/Settings/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
@@ -22,7 +22,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
index 5f760bfa..b57a171f 100644
--- a/Settings/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
@@ -21,7 +21,7 @@ import android.util.Log;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.DeviceInfoUtils;
diff --git a/Settings/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java
index 6ba45b35..fda03dc5 100644
--- a/Settings/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.deviceinfo;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.deviceinfo.AbstractIpAddressPreferenceController;
diff --git a/Settings/src/com/android/settings/deviceinfo/ManualPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/ManualPreferenceController.java
index 20464a55..bb9bc981 100644
--- a/Settings/src/com/android/settings/deviceinfo/ManualPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/ManualPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.deviceinfo;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
index 8e583fdb..d25d299f 100644
--- a/Settings/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -27,7 +27,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/Settings/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
index 759c7d80..a9ac2d58 100644
--- a/Settings/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
+++ b/Settings/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
@@ -35,7 +35,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.search.actionbar.SearchMenuController;
diff --git a/Settings/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/Settings/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
index 3820eb65..e4556220 100644
--- a/Settings/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
+++ b/Settings/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
@@ -35,7 +35,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
public class PrivateVolumeFormat extends InstrumentedFragment {
diff --git a/Settings/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java b/Settings/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
index dccb12dd..58753019 100644
--- a/Settings/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
+++ b/Settings/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
@@ -29,7 +29,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.deviceinfo.storage.StorageUtils.UnmountTask;
import com.android.settings.search.actionbar.SearchMenuController;
diff --git a/Settings/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/Settings/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
index 4fd63af2..7a3f3721 100644
--- a/Settings/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
+++ b/Settings/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -37,7 +37,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.util.Preconditions;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.deviceinfo.storage.StorageUtils;
import com.android.settings.deviceinfo.storage.StorageUtils.MountTask;
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageCategoryFragment.java b/Settings/src/com/android/settings/deviceinfo/StorageCategoryFragment.java
index 12800578..8eb7abc5 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageCategoryFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageCategoryFragment.java
@@ -33,7 +33,7 @@ import androidx.loader.content.Loader;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/Settings/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 0da3667f..fdf48014 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -39,7 +39,7 @@ import androidx.loader.content.Loader;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.deviceinfo.storage.AutomaticStorageManagementSwitchPreferenceController;
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageItemPreference.java b/Settings/src/com/android/settings/deviceinfo/StorageItemPreference.java
index 91102a03..e1eaa904 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -25,7 +25,7 @@ import android.widget.ProgressBar;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.deviceinfo.storage.StorageUtils;
public class StorageItemPreference extends Preference {
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardBase.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardBase.java
index bb9a7819..a82ac8c2 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -40,7 +40,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
index e2d8c7ed..bf6d64ef 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
@@ -33,7 +33,7 @@ import android.text.TextUtils;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class StorageWizardFormatConfirm extends InstrumentedDialogFragment {
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
index c97d5c9d..726a35f7 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
@@ -31,7 +31,7 @@ import android.util.Log;
import android.view.View;
import android.widget.Toast;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java
index b59d1696..9e20c4cb 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java
@@ -24,7 +24,7 @@ import android.os.storage.VolumeInfo;
import android.text.TextUtils;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
public class StorageWizardFormatSlow extends StorageWizardBase {
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardInit.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardInit.java
index b912ffe4..707ff2ab 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardInit.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardInit.java
@@ -31,7 +31,7 @@ import android.widget.TextView;
import android.widget.Toast;
import android.widget.ViewFlipper;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
public class StorageWizardInit extends StorageWizardBase {
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index 0b886572..9b7c4abb 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -31,7 +31,7 @@ import android.view.View;
import android.widget.Toast;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
index a4b29afb..713cbf25 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
@@ -29,7 +29,7 @@ import android.util.Log;
import android.view.View;
import android.widget.Toast;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import android.view.WindowManager;
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
index f55f8221..7d7df3f0 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -34,7 +34,7 @@ import android.view.View;
import com.android.internal.util.Preconditions;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.ChooseLockSettingsHelper;
public class StorageWizardMoveConfirm extends StorageWizardBase {
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
index 0c5e4a00..d0214723 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
@@ -29,7 +29,7 @@ import android.util.Log;
import android.view.View;
import android.widget.Toast;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class StorageWizardMoveProgress extends StorageWizardBase {
private static final String TAG = "StorageWizardMoveProgress";
diff --git a/Settings/src/com/android/settings/deviceinfo/StorageWizardReady.java b/Settings/src/com/android/settings/deviceinfo/StorageWizardReady.java
index 8de94724..85168028 100644
--- a/Settings/src/com/android/settings/deviceinfo/StorageWizardReady.java
+++ b/Settings/src/com/android/settings/deviceinfo/StorageWizardReady.java
@@ -21,7 +21,7 @@ import android.os.storage.VolumeInfo;
import android.view.View;
import android.widget.ImageView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class StorageWizardReady extends StorageWizardBase {
diff --git a/Settings/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java b/Settings/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
index 1955f360..2ff1d5c1 100644
--- a/Settings/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
@@ -24,7 +24,7 @@ import android.text.format.Formatter;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;
diff --git a/Settings/src/com/android/settings/deviceinfo/VolumeOptionMenuController.java b/Settings/src/com/android/settings/deviceinfo/VolumeOptionMenuController.java
index 289db520..dc3fb7c3 100644
--- a/Settings/src/com/android/settings/deviceinfo/VolumeOptionMenuController.java
+++ b/Settings/src/com/android/settings/deviceinfo/VolumeOptionMenuController.java
@@ -35,7 +35,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.deviceinfo.storage.StorageEntry;
import com.android.settings.deviceinfo.storage.StorageRenameFragment;
diff --git a/Settings/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java
index c7005966..d064b066 100644
--- a/Settings/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.deviceinfo;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.deviceinfo.AbstractWifiMacAddressPreferenceController;
diff --git a/Settings/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java b/Settings/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java
index b4d2d227..1a4cb0d7 100644
--- a/Settings/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java
+++ b/Settings/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java
@@ -24,7 +24,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/Settings/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index 50b60973..a79b56ff 100644
--- a/Settings/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -25,7 +25,7 @@ import android.os.Bundle;
import android.os.UserManager;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;
diff --git a/Settings/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java
index b022fcf7..8a232134 100644
--- a/Settings/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.BatteryManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.fuelgauge.BatteryUtils;
diff --git a/Settings/src/com/android/settings/deviceinfo/batteryinfo/BatteryInfoFragment.java b/Settings/src/com/android/settings/deviceinfo/batteryinfo/BatteryInfoFragment.java
index c0170227..937d6fec 100644
--- a/Settings/src/com/android/settings/deviceinfo/batteryinfo/BatteryInfoFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/batteryinfo/BatteryInfoFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.deviceinfo.batteryinfo;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
index dd3d5602..81f812ff 100644
--- a/Settings/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
@@ -21,7 +21,7 @@ import android.os.SystemProperties;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java b/Settings/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java
index e2d3d8a9..66010dc3 100644
--- a/Settings/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java
+++ b/Settings/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java
@@ -18,7 +18,7 @@ package com.android.settings.deviceinfo.firmwareversion;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
index fa71c346..9d1ed881 100644
--- a/Settings/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
@@ -29,6 +29,7 @@ import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.flags.Flags;
+import com.cariad.cea.settings.R;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -61,7 +62,7 @@ public class MainlineModuleVersionPreferenceController extends BasePreferenceCon
mPackageManager = mContext.getPackageManager();
if (Flags.mainlineModuleExplicitIntent()) {
String packageName = mContext
- .getString(com.android.settings.R.string.config_mainline_module_update_package);
+ .getString(R.string.config_mainline_module_update_package);
MODULE_UPDATE_INTENT.setPackage(packageName);
MODULE_UPDATE_V2_INTENT.setPackage(packageName);
}
diff --git a/Settings/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java b/Settings/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java
index 713eaf4f..3b09f064 100644
--- a/Settings/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.deviceinfo.hardwareinfo;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
index 028cd135..ab99d09b 100644
--- a/Settings/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.os.SystemProperties;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class HardwareRevisionPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java
index 01ddeab1..9f288365 100644
--- a/Settings/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.deviceinfo.hardwareinfo;
import android.content.Context;
import android.os.Build;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class SerialNumberPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
index 1ae6b400..aa3bfe05 100644
--- a/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
+++ b/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
@@ -26,7 +26,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class ImeiInfoDialogController {
diff --git a/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java
index c8d78da7..fe08f3da 100644
--- a/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java
@@ -30,7 +30,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.deviceinfo.PhoneNumberUtil;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
index ff551847..3408a94d 100644
--- a/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deviceinfo.simstatus.SlotSimStatus;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/deviceinfo/legal/ModuleLicensePreference.java b/Settings/src/com/android/settings/deviceinfo/legal/ModuleLicensePreference.java
index 8a3c9aad..2723dbc6 100644
--- a/Settings/src/com/android/settings/deviceinfo/legal/ModuleLicensePreference.java
+++ b/Settings/src/com/android/settings/deviceinfo/legal/ModuleLicensePreference.java
@@ -25,7 +25,7 @@ import android.widget.Toast;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Preference in a list that represents a mainline module that has a licenses file.
diff --git a/Settings/src/com/android/settings/deviceinfo/legal/ModuleLicensesDashboard.java b/Settings/src/com/android/settings/deviceinfo/legal/ModuleLicensesDashboard.java
index f74b68f9..63984e6e 100644
--- a/Settings/src/com/android/settings/deviceinfo/legal/ModuleLicensesDashboard.java
+++ b/Settings/src/com/android/settings/deviceinfo/legal/ModuleLicensesDashboard.java
@@ -18,7 +18,7 @@ package com.android.settings.deviceinfo.legal;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
public class ModuleLicensesDashboard extends DashboardFragment {
diff --git a/Settings/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java
index caa5afcd..5f30863c 100644
--- a/Settings/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java
@@ -17,7 +17,7 @@ package com.android.settings.deviceinfo.legal;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class WallpaperAttributionsPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfo.kt b/Settings/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfo.kt
index e26e0610..409d72fd 100644
--- a/Settings/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfo.kt
+++ b/Settings/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfo.kt
@@ -22,7 +22,7 @@ import android.graphics.drawable.Drawable
import android.os.SystemProperties
import androidx.annotation.DrawableRes
import androidx.annotation.VisibleForTesting
-import com.android.settings.R
+import com.cariad.cea.settings.R
diff --git a/Settings/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt b/Settings/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
index f765d8c6..2fbccda2 100644
--- a/Settings/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
+++ b/Settings/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
@@ -27,7 +27,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settings.deviceinfo.PhoneNumberUtil
import com.android.settings.network.SubscriptionUtil
diff --git a/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 6ac0d267..60df3d51 100644
--- a/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -58,7 +58,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java b/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
index f212eea0..016a6814 100644
--- a/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
@@ -30,7 +30,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.deviceinfo.PhoneNumberUtil;
diff --git a/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
index 828e016b..c35d8f5a 100644
--- a/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.Utils;
diff --git a/Settings/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index b98fbda0..5d86d994 100644
--- a/Settings/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deletionhelper.ActivationWarningFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/deviceinfo/storage/DiskInitFragment.java b/Settings/src/com/android/settings/deviceinfo/storage/DiskInitFragment.java
index 1e6a98d1..55f2513a 100644
--- a/Settings/src/com/android/settings/deviceinfo/storage/DiskInitFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/storage/DiskInitFragment.java
@@ -28,7 +28,7 @@ import android.text.TextUtils;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.deviceinfo.StorageWizardInit;
diff --git a/Settings/src/com/android/settings/deviceinfo/storage/EmptyTrashFragment.java b/Settings/src/com/android/settings/deviceinfo/storage/EmptyTrashFragment.java
index 3c486721..0ad7db71 100644
--- a/Settings/src/com/android/settings/deviceinfo/storage/EmptyTrashFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/storage/EmptyTrashFragment.java
@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.utils.ThreadUtils;
diff --git a/Settings/src/com/android/settings/deviceinfo/storage/StorageEntry.java b/Settings/src/com/android/settings/deviceinfo/storage/StorageEntry.java
index 38b2c338..1005fc07 100644
--- a/Settings/src/com/android/settings/deviceinfo/storage/StorageEntry.java
+++ b/Settings/src/com/android/settings/deviceinfo/storage/StorageEntry.java
@@ -27,7 +27,7 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.io.File;
diff --git a/Settings/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index fd424178..79e154b8 100644
--- a/Settings/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -42,7 +42,7 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java b/Settings/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
index c6eb0c8a..07b9809a 100644
--- a/Settings/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
+++ b/Settings/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
@@ -30,7 +30,7 @@ import android.widget.EditText;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java b/Settings/src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java
index be2a64ab..499705b0 100644
--- a/Settings/src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java
+++ b/Settings/src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.widget.UsageProgressBarPreference;
diff --git a/Settings/src/com/android/settings/deviceinfo/storage/StorageUtils.java b/Settings/src/com/android/settings/deviceinfo/storage/StorageUtils.java
index 4b6a2c40..d3c17ac2 100644
--- a/Settings/src/com/android/settings/deviceinfo/storage/StorageUtils.java
+++ b/Settings/src/com/android/settings/deviceinfo/storage/StorageUtils.java
@@ -37,7 +37,7 @@ import android.widget.Toast;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/display/AdaptiveSleepBatterySaverPreferenceController.java b/Settings/src/com/android/settings/display/AdaptiveSleepBatterySaverPreferenceController.java
index 528c94d7..2c594e10 100644
--- a/Settings/src/com/android/settings/display/AdaptiveSleepBatterySaverPreferenceController.java
+++ b/Settings/src/com/android/settings/display/AdaptiveSleepBatterySaverPreferenceController.java
@@ -22,7 +22,7 @@ import android.os.PowerManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.BannerMessagePreference;
/**
diff --git a/Settings/src/com/android/settings/display/AdaptiveSleepCameraStatePreferenceController.java b/Settings/src/com/android/settings/display/AdaptiveSleepCameraStatePreferenceController.java
index a7bbdff1..0a6ea712 100644
--- a/Settings/src/com/android/settings/display/AdaptiveSleepCameraStatePreferenceController.java
+++ b/Settings/src/com/android/settings/display/AdaptiveSleepCameraStatePreferenceController.java
@@ -31,7 +31,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.BannerMessagePreference;
/**
diff --git a/Settings/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java b/Settings/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
index c3db6f7e..27ffcade 100644
--- a/Settings/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
+++ b/Settings/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
@@ -26,7 +26,7 @@ import android.net.Uri;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.BannerMessagePreference;
/**
diff --git a/Settings/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/Settings/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
index 725b956a..34b5d82f 100644
--- a/Settings/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
+++ b/Settings/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
@@ -36,7 +36,7 @@ import android.text.TextUtils;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.RestrictionUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
diff --git a/Settings/src/com/android/settings/display/AlwaysOnDisplaySlice.java b/Settings/src/com/android/settings/display/AlwaysOnDisplaySlice.java
index 7a9f2f9c..193a4105 100644
--- a/Settings/src/com/android/settings/display/AlwaysOnDisplaySlice.java
+++ b/Settings/src/com/android/settings/display/AlwaysOnDisplaySlice.java
@@ -34,7 +34,7 @@ import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.CustomSliceable;
diff --git a/Settings/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/Settings/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 24580349..1313ac6f 100644
--- a/Settings/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/Settings/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -26,7 +26,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {
diff --git a/Settings/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/Settings/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index 71d431a0..52b90f65 100644
--- a/Settings/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/Settings/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -25,7 +25,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/display/AppGridView.java b/Settings/src/com/android/settings/display/AppGridView.java
index a0f2a638..9372966c 100644
--- a/Settings/src/com/android/settings/display/AppGridView.java
+++ b/Settings/src/com/android/settings/display/AppGridView.java
@@ -35,7 +35,7 @@ import android.widget.ImageView;
import androidx.annotation.VisibleForTesting;
import androidx.core.util.Preconditions;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/Settings/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/Settings/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index d925de39..2ac16304 100644
--- a/Settings/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/Settings/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -20,7 +20,7 @@ import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
diff --git a/Settings/src/com/android/settings/display/AutoBrightnessSettings.java b/Settings/src/com/android/settings/display/AutoBrightnessSettings.java
index 0c594730..018a8b8a 100644
--- a/Settings/src/com/android/settings/display/AutoBrightnessSettings.java
+++ b/Settings/src/com/android/settings/display/AutoBrightnessSettings.java
@@ -19,7 +19,7 @@ package com.android.settings.display;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/display/AutoRotatePreferenceController.java b/Settings/src/com/android/settings/display/AutoRotatePreferenceController.java
index ec2592d3..34e1dd5f 100644
--- a/Settings/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/Settings/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -20,7 +20,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.internal.view.RotationPolicy;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/display/AutoRotateSwitchBarController.java b/Settings/src/com/android/settings/display/AutoRotateSwitchBarController.java
index e6fc2e34..f309859d 100644
--- a/Settings/src/com/android/settings/display/AutoRotateSwitchBarController.java
+++ b/Settings/src/com/android/settings/display/AutoRotateSwitchBarController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.internal.view.RotationPolicy;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/display/ColorModePreferenceFragment.java b/Settings/src/com/android/settings/display/ColorModePreferenceFragment.java
index ce33e673..3bed6242 100644
--- a/Settings/src/com/android/settings/display/ColorModePreferenceFragment.java
+++ b/Settings/src/com/android/settings/display/ColorModePreferenceFragment.java
@@ -41,7 +41,7 @@ import androidx.preference.PreferenceScreen;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/display/ColorModeUtils.java b/Settings/src/com/android/settings/display/ColorModeUtils.java
index cdd978e4..31df04fc 100644
--- a/Settings/src/com/android/settings/display/ColorModeUtils.java
+++ b/Settings/src/com/android/settings/display/ColorModeUtils.java
@@ -26,7 +26,7 @@ import static android.hardware.display.ColorDisplayManager.VENDOR_COLOR_MODE_RAN
import android.content.res.Resources;
import android.util.ArrayMap;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Map;
diff --git a/Settings/src/com/android/settings/display/ControlsPrivacyPreferenceController.java b/Settings/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
index b9a2bfa8..9715cde8 100644
--- a/Settings/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
+++ b/Settings/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
@@ -24,7 +24,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java b/Settings/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java
index be2de59b..436df24f 100644
--- a/Settings/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java
+++ b/Settings/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/display/ConversationMessageView.java b/Settings/src/com/android/settings/display/ConversationMessageView.java
index d72c9e62..62ffb36e 100644
--- a/Settings/src/com/android/settings/display/ConversationMessageView.java
+++ b/Settings/src/com/android/settings/display/ConversationMessageView.java
@@ -32,7 +32,7 @@ import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* The view for a single entry in a conversation. This is a simplified version of
diff --git a/Settings/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceController.java b/Settings/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceController.java
index 27e2a139..9d440414 100644
--- a/Settings/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceController.java
+++ b/Settings/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceController.java
@@ -23,7 +23,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.utils.ThreadUtils;
diff --git a/Settings/src/com/android/settings/display/CustomizableLockScreenUtils.java b/Settings/src/com/android/settings/display/CustomizableLockScreenUtils.java
index 23444364..4bb43666 100644
--- a/Settings/src/com/android/settings/display/CustomizableLockScreenUtils.java
+++ b/Settings/src/com/android/settings/display/CustomizableLockScreenUtils.java
@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/Settings/src/com/android/settings/display/DarkUIPreferenceController.java b/Settings/src/com/android/settings/display/DarkUIPreferenceController.java
index f1bbfcd4..fd6d7db9 100644
--- a/Settings/src/com/android/settings/display/DarkUIPreferenceController.java
+++ b/Settings/src/com/android/settings/display/DarkUIPreferenceController.java
@@ -28,7 +28,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/display/DensityPreference.java b/Settings/src/com/android/settings/display/DensityPreference.java
index d30a42a0..3eb84827 100644
--- a/Settings/src/com/android/settings/display/DensityPreference.java
+++ b/Settings/src/com/android/settings/display/DensityPreference.java
@@ -25,7 +25,7 @@ import android.view.Display;
import android.view.View;
import android.widget.EditText;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.CustomEditTextPreferenceCompat;
import com.android.settingslib.display.DisplayDensityConfiguration;
diff --git a/Settings/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragment.java b/Settings/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragment.java
index 55ec6d7b..bfdf82e7 100644
--- a/Settings/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragment.java
+++ b/Settings/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.display;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java b/Settings/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java
index e38f5d41..2b5558e2 100644
--- a/Settings/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java
+++ b/Settings/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/display/DeviceStateAutoRotationHelper.java b/Settings/src/com/android/settings/display/DeviceStateAutoRotationHelper.java
index 223ef1aa..c4601d0a 100644
--- a/Settings/src/com/android/settings/display/DeviceStateAutoRotationHelper.java
+++ b/Settings/src/com/android/settings/display/DeviceStateAutoRotationHelper.java
@@ -22,7 +22,7 @@ import android.util.Log;
import androidx.lifecycle.Lifecycle;
import com.android.internal.view.RotationPolicy;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager;
diff --git a/Settings/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java b/Settings/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
index 805cb089..20b921e5 100644
--- a/Settings/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
+++ b/Settings/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
@@ -28,7 +28,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/display/EvenDimmerPreferenceController.java b/Settings/src/com/android/settings/display/EvenDimmerPreferenceController.java
index b86c8457..cf8d67b3 100644
--- a/Settings/src/com/android/settings/display/EvenDimmerPreferenceController.java
+++ b/Settings/src/com/android/settings/display/EvenDimmerPreferenceController.java
@@ -24,7 +24,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import com.android.server.display.feature.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/display/FoldLockBehaviorPreferenceController.java b/Settings/src/com/android/settings/display/FoldLockBehaviorPreferenceController.java
index bee3a22e..2ccec0d5 100644
--- a/Settings/src/com/android/settings/display/FoldLockBehaviorPreferenceController.java
+++ b/Settings/src/com/android/settings/display/FoldLockBehaviorPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.preference.Preference;
import com.android.internal.foldables.FoldGracePeriodProvider;
import com.android.internal.foldables.FoldLockSettingAvailabilityProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.HashMap;
diff --git a/Settings/src/com/android/settings/display/FoldLockBehaviorSettings.java b/Settings/src/com/android/settings/display/FoldLockBehaviorSettings.java
index 889a7dd9..32f74164 100644
--- a/Settings/src/com/android/settings/display/FoldLockBehaviorSettings.java
+++ b/Settings/src/com/android/settings/display/FoldLockBehaviorSettings.java
@@ -25,7 +25,7 @@ import android.provider.Settings;
import android.util.Log;
import com.android.internal.foldables.FoldGracePeriodProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settings.utils.CandidateInfoExtra;
import com.android.settings.widget.RadioButtonPickerFragment;
diff --git a/Settings/src/com/android/settings/display/LockscreenClockPreferenceController.java b/Settings/src/com/android/settings/display/LockscreenClockPreferenceController.java
index bf427b20..dc33d1c3 100644
--- a/Settings/src/com/android/settings/display/LockscreenClockPreferenceController.java
+++ b/Settings/src/com/android/settings/display/LockscreenClockPreferenceController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/display/MessageBubbleBackground.java b/Settings/src/com/android/settings/display/MessageBubbleBackground.java
index 645db312..8377fc40 100644
--- a/Settings/src/com/android/settings/display/MessageBubbleBackground.java
+++ b/Settings/src/com/android/settings/display/MessageBubbleBackground.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.widget.LinearLayout;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class MessageBubbleBackground extends LinearLayout {
private final int mSnapWidthPixels;
diff --git a/Settings/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/Settings/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index fd6d199a..86b83a8c 100644
--- a/Settings/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/Settings/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -25,7 +25,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/Settings/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
index ef11e00c..c15a7ca9 100644
--- a/Settings/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
+++ b/Settings/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
@@ -24,7 +24,7 @@ import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class NightDisplayAutoModePreferenceController extends BasePreferenceController
diff --git a/Settings/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/Settings/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index 700b601a..1a7cd460 100644
--- a/Settings/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/Settings/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -23,7 +23,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.widget.SeekBarPreference;
diff --git a/Settings/src/com/android/settings/display/NightDisplayPreferenceController.java b/Settings/src/com/android/settings/display/NightDisplayPreferenceController.java
index 2f2e2422..d6d8040d 100644
--- a/Settings/src/com/android/settings/display/NightDisplayPreferenceController.java
+++ b/Settings/src/com/android/settings/display/NightDisplayPreferenceController.java
@@ -20,7 +20,7 @@ import android.hardware.display.NightDisplayListener;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/display/NightDisplaySettings.java b/Settings/src/com/android/settings/display/NightDisplaySettings.java
index 39750c99..8c95731e 100644
--- a/Settings/src/com/android/settings/display/NightDisplaySettings.java
+++ b/Settings/src/com/android/settings/display/NightDisplaySettings.java
@@ -26,7 +26,7 @@ import android.os.Bundle;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/display/NightDisplayTimeFormatter.java b/Settings/src/com/android/settings/display/NightDisplayTimeFormatter.java
index aa715de3..d56683dd 100644
--- a/Settings/src/com/android/settings/display/NightDisplayTimeFormatter.java
+++ b/Settings/src/com/android/settings/display/NightDisplayTimeFormatter.java
@@ -19,7 +19,7 @@ package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.text.DateFormat;
import java.time.LocalTime;
diff --git a/Settings/src/com/android/settings/display/PeakRefreshRatePreferenceController.java b/Settings/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
index 261eaf13..7886d1de 100644
--- a/Settings/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
+++ b/Settings/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
@@ -32,7 +32,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.server.display.feature.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/display/QRCodeScannerPreferenceController.java b/Settings/src/com/android/settings/display/QRCodeScannerPreferenceController.java
index cb022a74..93c36dd3 100644
--- a/Settings/src/com/android/settings/display/QRCodeScannerPreferenceController.java
+++ b/Settings/src/com/android/settings/display/QRCodeScannerPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/display/ScreenResolutionController.java b/Settings/src/com/android/settings/display/ScreenResolutionController.java
index a3433d40..fb4c0874 100644
--- a/Settings/src/com/android/settings/display/ScreenResolutionController.java
+++ b/Settings/src/com/android/settings/display/ScreenResolutionController.java
@@ -24,7 +24,7 @@ import android.view.Display;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/display/ScreenResolutionFragment.java b/Settings/src/com/android/settings/display/ScreenResolutionFragment.java
index a2ad25ff..8067a4cf 100644
--- a/Settings/src/com/android/settings/display/ScreenResolutionFragment.java
+++ b/Settings/src/com/android/settings/display/ScreenResolutionFragment.java
@@ -33,7 +33,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.SettingsStatsLog;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.RadioButtonPickerFragment;
diff --git a/Settings/src/com/android/settings/display/ScreenSaverPreferenceController.java b/Settings/src/com/android/settings/display/ScreenSaverPreferenceController.java
index 9b609196..c8a84469 100644
--- a/Settings/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/Settings/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -15,7 +15,7 @@ package com.android.settings.display;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
diff --git a/Settings/src/com/android/settings/display/ScreenTimeoutPreferenceController.java b/Settings/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
index 12541167..479c48d7 100644
--- a/Settings/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
+++ b/Settings/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
@@ -30,7 +30,7 @@ import android.provider.Settings;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
diff --git a/Settings/src/com/android/settings/display/ScreenTimeoutSettings.java b/Settings/src/com/android/settings/display/ScreenTimeoutSettings.java
index 2d229a3c..8b29b1c0 100644
--- a/Settings/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/Settings/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -37,7 +37,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java b/Settings/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
index 8400cbb2..9c5522eb 100644
--- a/Settings/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
+++ b/Settings/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
@@ -33,7 +33,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.BannerMessagePreference;
diff --git a/Settings/src/com/android/settings/display/SmartAutoRotateCameraStateController.java b/Settings/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
index 56acbe19..228dcba9 100644
--- a/Settings/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
+++ b/Settings/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
@@ -33,7 +33,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.BannerMessagePreference;
diff --git a/Settings/src/com/android/settings/display/SmartAutoRotateController.java b/Settings/src/com/android/settings/display/SmartAutoRotateController.java
index b5e3af22..658cc473 100644
--- a/Settings/src/com/android/settings/display/SmartAutoRotateController.java
+++ b/Settings/src/com/android/settings/display/SmartAutoRotateController.java
@@ -42,7 +42,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.view.RotationPolicy;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/display/SmartAutoRotatePermissionController.java b/Settings/src/com/android/settings/display/SmartAutoRotatePermissionController.java
index aa6a96d5..29a4ad42 100644
--- a/Settings/src/com/android/settings/display/SmartAutoRotatePermissionController.java
+++ b/Settings/src/com/android/settings/display/SmartAutoRotatePermissionController.java
@@ -26,7 +26,7 @@ import android.net.Uri;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
diff --git a/Settings/src/com/android/settings/display/SmartAutoRotatePreferenceController.java b/Settings/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
index a5c15b6b..6d2bc251 100644
--- a/Settings/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
+++ b/Settings/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
@@ -43,7 +43,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.view.RotationPolicy;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java b/Settings/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java
index 8fd996ea..f777b113 100644
--- a/Settings/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java
+++ b/Settings/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java
@@ -28,7 +28,7 @@ import android.view.ViewGroup;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/display/ThemePreferenceController.java b/Settings/src/com/android/settings/display/ThemePreferenceController.java
index 25c6b691..d76d748d 100644
--- a/Settings/src/com/android/settings/display/ThemePreferenceController.java
+++ b/Settings/src/com/android/settings/display/ThemePreferenceController.java
@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/display/TimeoutListPreference.java b/Settings/src/com/android/settings/display/TimeoutListPreference.java
index 5079ccae..629b6233 100644
--- a/Settings/src/com/android/settings/display/TimeoutListPreference.java
+++ b/Settings/src/com/android/settings/display/TimeoutListPreference.java
@@ -32,7 +32,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog.Builder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/src/com/android/settings/display/TopLevelDisplayPreferenceController.java b/Settings/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
index 5fda13ef..7c263911 100644
--- a/Settings/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
+++ b/Settings/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.display;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class TopLevelDisplayPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java b/Settings/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
index 0136eac1..a2e03aa3 100644
--- a/Settings/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
+++ b/Settings/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
@@ -30,7 +30,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/display/TwilightLocationDialog.java b/Settings/src/com/android/settings/display/TwilightLocationDialog.java
index 1a2cf673..2a364f3c 100644
--- a/Settings/src/com/android/settings/display/TwilightLocationDialog.java
+++ b/Settings/src/com/android/settings/display/TwilightLocationDialog.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.Intent;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
/*
diff --git a/Settings/src/com/android/settings/display/TwilightLocationPreferenceController.java b/Settings/src/com/android/settings/display/TwilightLocationPreferenceController.java
index 9e35fc66..9240e3c2 100644
--- a/Settings/src/com/android/settings/display/TwilightLocationPreferenceController.java
+++ b/Settings/src/com/android/settings/display/TwilightLocationPreferenceController.java
@@ -22,7 +22,7 @@ import android.location.LocationManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/display/VrDisplayPreferenceController.java b/Settings/src/com/android/settings/display/VrDisplayPreferenceController.java
index 6fcb5b0b..9ee4675c 100644
--- a/Settings/src/com/android/settings/display/VrDisplayPreferenceController.java
+++ b/Settings/src/com/android/settings/display/VrDisplayPreferenceController.java
@@ -20,7 +20,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/display/VrDisplayPreferencePicker.java b/Settings/src/com/android/settings/display/VrDisplayPreferencePicker.java
index 4612779b..c072c4ad 100644
--- a/Settings/src/com/android/settings/display/VrDisplayPreferencePicker.java
+++ b/Settings/src/com/android/settings/display/VrDisplayPreferencePicker.java
@@ -22,7 +22,7 @@ import android.graphics.drawable.Drawable;
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/src/com/android/settings/display/WalletPrivacyPreferenceController.java b/Settings/src/com/android/settings/display/WalletPrivacyPreferenceController.java
index 77fa0796..35bb3d8e 100644
--- a/Settings/src/com/android/settings/display/WalletPrivacyPreferenceController.java
+++ b/Settings/src/com/android/settings/display/WalletPrivacyPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/display/WallpaperPreferenceController.java b/Settings/src/com/android/settings/display/WallpaperPreferenceController.java
index 9972bf9c..b1970757 100644
--- a/Settings/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/Settings/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -27,7 +27,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java b/Settings/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
index 5f441be7..1e18484c 100644
--- a/Settings/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
+++ b/Settings/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
@@ -24,7 +24,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java b/Settings/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
index 488befb4..52256d8a 100644
--- a/Settings/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
+++ b/Settings/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
@@ -25,7 +25,7 @@ import android.content.Intent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/display/darkmode/DarkModePreference.java b/Settings/src/com/android/settings/display/darkmode/DarkModePreference.java
index 4e1e3087..08c9c344 100644
--- a/Settings/src/com/android/settings/display/darkmode/DarkModePreference.java
+++ b/Settings/src/com/android/settings/display/darkmode/DarkModePreference.java
@@ -20,7 +20,7 @@ import android.content.res.Configuration;
import android.os.PowerManager;
import android.util.AttributeSet;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.PrimarySwitchPreference;
import java.time.LocalTime;
diff --git a/Settings/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorController.java b/Settings/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorController.java
index e122ad06..36075f01 100644
--- a/Settings/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorController.java
+++ b/Settings/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorController.java
@@ -24,7 +24,7 @@ import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.display.TwilightLocationDialog;
diff --git a/Settings/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java b/Settings/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
index 17d32a53..a43edb57 100644
--- a/Settings/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
+++ b/Settings/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
@@ -23,7 +23,7 @@ import android.os.PowerManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/dream/AutoFitGridLayoutManager.java b/Settings/src/com/android/settings/dream/AutoFitGridLayoutManager.java
index 7de0eaea..2cb60e15 100644
--- a/Settings/src/com/android/settings/dream/AutoFitGridLayoutManager.java
+++ b/Settings/src/com/android/settings/dream/AutoFitGridLayoutManager.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Grid layout manager that calculates the number of columns for the screen size. */
public final class AutoFitGridLayoutManager extends GridLayoutManager {
diff --git a/Settings/src/com/android/settings/dream/DreamAdapter.java b/Settings/src/com/android/settings/dream/DreamAdapter.java
index 1d1c3bd9..8e4e1fdc 100644
--- a/Settings/src/com/android/settings/dream/DreamAdapter.java
+++ b/Settings/src/com/android/settings/dream/DreamAdapter.java
@@ -31,7 +31,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.ColorUtil;
import java.util.List;
diff --git a/Settings/src/com/android/settings/dream/DreamComplicationPreferenceController.java b/Settings/src/com/android/settings/dream/DreamComplicationPreferenceController.java
index 7d01fdb1..ec2cfee0 100644
--- a/Settings/src/com/android/settings/dream/DreamComplicationPreferenceController.java
+++ b/Settings/src/com/android/settings/dream/DreamComplicationPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.dream;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.dream.DreamBackend;
diff --git a/Settings/src/com/android/settings/dream/DreamHomeControlsPreferenceController.java b/Settings/src/com/android/settings/dream/DreamHomeControlsPreferenceController.java
index 0e777ec4..37ad0590 100644
--- a/Settings/src/com/android/settings/dream/DreamHomeControlsPreferenceController.java
+++ b/Settings/src/com/android/settings/dream/DreamHomeControlsPreferenceController.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.dream.DreamBackend;
diff --git a/Settings/src/com/android/settings/dream/DreamPickerController.java b/Settings/src/com/android/settings/dream/DreamPickerController.java
index 3eb1fb1f..9b295609 100644
--- a/Settings/src/com/android/settings/dream/DreamPickerController.java
+++ b/Settings/src/com/android/settings/dream/DreamPickerController.java
@@ -25,7 +25,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/dream/DreamSettings.java b/Settings/src/com/android/settings/dream/DreamSettings.java
index 418bb641..3258f47e 100644
--- a/Settings/src/com/android/settings/dream/DreamSettings.java
+++ b/Settings/src/com/android/settings/dream/DreamSettings.java
@@ -36,7 +36,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/dream/WhenToDreamPicker.java b/Settings/src/com/android/settings/dream/WhenToDreamPicker.java
index 3052d20b..608705e7 100644
--- a/Settings/src/com/android/settings/dream/WhenToDreamPicker.java
+++ b/Settings/src/com/android/settings/dream/WhenToDreamPicker.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.graphics.drawable.Drawable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/Settings/src/com/android/settings/dream/WhenToDreamPreferenceController.java
index c3bae006..2c7451a7 100644
--- a/Settings/src/com/android/settings/dream/WhenToDreamPreferenceController.java
+++ b/Settings/src/com/android/settings/dream/WhenToDreamPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/emergency/EmergencyActionContentProvider.java b/Settings/src/com/android/settings/emergency/EmergencyActionContentProvider.java
index 03f0faf4..f66af46e 100644
--- a/Settings/src/com/android/settings/emergency/EmergencyActionContentProvider.java
+++ b/Settings/src/com/android/settings/emergency/EmergencyActionContentProvider.java
@@ -31,7 +31,7 @@ import android.telecom.TelecomManager;
import android.text.TextUtils;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
/**
diff --git a/Settings/src/com/android/settings/emergency/EmergencyDashboardFragment.java b/Settings/src/com/android/settings/emergency/EmergencyDashboardFragment.java
index aa5a2ec0..9f439621 100644
--- a/Settings/src/com/android/settings/emergency/EmergencyDashboardFragment.java
+++ b/Settings/src/com/android/settings/emergency/EmergencyDashboardFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.emergency;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.EmergencyBroadcastPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java b/Settings/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
index 155efd37..2d61938b 100644
--- a/Settings/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
+++ b/Settings/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
diff --git a/Settings/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java b/Settings/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java
index 9b5fea7a..97c79ef6 100644
--- a/Settings/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java
+++ b/Settings/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java
@@ -27,7 +27,7 @@ import android.widget.EditText;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.CustomDialogPreferenceCompat;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
diff --git a/Settings/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java b/Settings/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java
index b6e46e6d..81ea2f9f 100644
--- a/Settings/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java
+++ b/Settings/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java
@@ -29,7 +29,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java b/Settings/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
index b222cc17..82a1c6e3 100644
--- a/Settings/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
+++ b/Settings/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
import com.android.settingslib.widget.MainSwitchPreference;
diff --git a/Settings/src/com/android/settings/emergency/EmergencyGestureSettings.java b/Settings/src/com/android/settings/emergency/EmergencyGestureSettings.java
index 3803ce14..85658700 100644
--- a/Settings/src/com/android/settings/emergency/EmergencyGestureSettings.java
+++ b/Settings/src/com/android/settings/emergency/EmergencyGestureSettings.java
@@ -19,7 +19,7 @@ package com.android.settings.emergency;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java b/Settings/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
index 52694af5..83919112 100644
--- a/Settings/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
+++ b/Settings/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
diff --git a/Settings/src/com/android/settings/emergency/MoreSettingsPreferenceController.java b/Settings/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
index 4771f5ac..92913d49 100644
--- a/Settings/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
+++ b/Settings/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
@@ -40,7 +40,7 @@ import android.widget.Button;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/Settings/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 9fc51ac0..5e688102 100644
--- a/Settings/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/Settings/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -36,7 +36,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
diff --git a/Settings/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java b/Settings/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java
index 09337993..c8d8e9b7 100644
--- a/Settings/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java
+++ b/Settings/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java
@@ -27,7 +27,7 @@ import android.os.UserHandle;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
import com.android.settingslib.enterprise.ActionDisabledLearnMoreButtonLauncher;
diff --git a/Settings/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/Settings/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
index bdbdce96..d7f596e6 100644
--- a/Settings/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
+++ b/Settings/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
@@ -22,7 +22,7 @@ import android.text.format.DateUtils;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/Settings/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index de14689a..d1d6b8e9 100644
--- a/Settings/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/Settings/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -19,7 +19,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/Settings/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
index b6027918..d35ed2d7 100644
--- a/Settings/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/Settings/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/enterprise/ApplicationListFragment.java b/Settings/src/com/android/settings/enterprise/ApplicationListFragment.java
index 10707bae..f9666135 100644
--- a/Settings/src/com/android/settings/enterprise/ApplicationListFragment.java
+++ b/Settings/src/com/android/settings/enterprise/ApplicationListFragment.java
@@ -23,7 +23,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/Settings/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
index 394de07e..1d67e7e5 100644
--- a/Settings/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
+++ b/Settings/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceControllerBase {
diff --git a/Settings/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java b/Settings/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
index 2e87cb9b..f0715d48 100644
--- a/Settings/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
+++ b/Settings/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
@@ -18,7 +18,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java b/Settings/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java
index 9d9f015c..8335dc7b 100644
--- a/Settings/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java
+++ b/Settings/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java
@@ -25,7 +25,7 @@ import static java.util.Objects.requireNonNull;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.enterprise.DeviceAdminStringProvider;
class DeviceAdminStringProviderImpl implements DeviceAdminStringProvider {
diff --git a/Settings/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/Settings/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
index 141116fb..c1a68dac 100644
--- a/Settings/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/Settings/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -17,7 +17,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/Settings/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 887fc321..804e8f85 100644
--- a/Settings/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/Settings/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -37,7 +37,7 @@ import android.text.SpannableStringBuilder;
import android.text.style.ClickableSpan;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.vpn2.VpnUtils;
import com.android.settingslib.utils.WorkPolicyUtils;
diff --git a/Settings/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/Settings/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index da1cb453..9adeac71 100644
--- a/Settings/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/Settings/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -48,7 +48,7 @@ import android.os.Bundle;
import android.provider.SearchIndexableResource;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java b/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
index 67bf6878..d7131818 100644
--- a/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
+++ b/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.enterprise;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
index d72cd8f6..135c231e 100644
--- a/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
+++ b/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.EnterpriseDefaultApps;
diff --git a/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
index 72a06fea..16585b4e 100644
--- a/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -19,7 +19,7 @@ import android.os.UserHandle;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.core.PreferenceControllerMixin;
diff --git a/Settings/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/Settings/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
index 6bade7c9..0f7797cd 100644
--- a/Settings/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/Settings/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -18,7 +18,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/enterprise/ImePreferenceController.java b/Settings/src/com/android/settings/enterprise/ImePreferenceController.java
index ae47d218..d2f5134c 100644
--- a/Settings/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/Settings/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/Settings/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
index 4b301d5f..8a62ac3e 100644
--- a/Settings/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
+++ b/Settings/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
@@ -18,7 +18,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.NUMBER_OF
import android.app.admin.DevicePolicyManager;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java b/Settings/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java
index e54fbcb0..74b594e6 100644
--- a/Settings/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java
+++ b/Settings/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java
@@ -25,7 +25,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import java.util.Objects;
diff --git a/Settings/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreference.java b/Settings/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreference.java
index 19556a13..1d5319b3 100644
--- a/Settings/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreference.java
+++ b/Settings/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreference.java
@@ -19,7 +19,7 @@ package com.android.settings.enterprise;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/enterprise/PrivacySettingsFinancedPreference.java b/Settings/src/com/android/settings/enterprise/PrivacySettingsFinancedPreference.java
index 8612f6a1..dc142418 100644
--- a/Settings/src/com/android/settings/enterprise/PrivacySettingsFinancedPreference.java
+++ b/Settings/src/com/android/settings/enterprise/PrivacySettingsFinancedPreference.java
@@ -19,7 +19,7 @@ package com.android.settings.enterprise;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Collections;
diff --git a/Settings/src/com/android/settings/flashlight/FlashlightHandleActivity.java b/Settings/src/com/android/settings/flashlight/FlashlightHandleActivity.java
index 6740da43..21b87c83 100644
--- a/Settings/src/com/android/settings/flashlight/FlashlightHandleActivity.java
+++ b/Settings/src/com/android/settings/flashlight/FlashlightHandleActivity.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import android.provider.Settings;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/flashlight/FlashlightSlice.java b/Settings/src/com/android/settings/flashlight/FlashlightSlice.java
index 5feaf4f7..e5e170a0 100644
--- a/Settings/src/com/android/settings/flashlight/FlashlightSlice.java
+++ b/Settings/src/com/android/settings/flashlight/FlashlightSlice.java
@@ -39,7 +39,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.CustomSliceable;
diff --git a/Settings/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/Settings/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 6ef5aa82..485df4a4 100644
--- a/Settings/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/Settings/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -34,7 +34,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.appinfo.AppButtonsPreferenceController;
diff --git a/Settings/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailActivity.java b/Settings/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailActivity.java
index 3ef2c0cd..86d32bdb 100644
--- a/Settings/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailActivity.java
+++ b/Settings/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailActivity.java
@@ -29,7 +29,7 @@ import android.util.Log;
import androidx.appcompat.app.AppCompatActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 6a65dc07..a7d1dbe3 100644
--- a/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -26,7 +26,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
diff --git a/Settings/src/com/android/settings/fuelgauge/BatteryInfo.java b/Settings/src/com/android/settings/fuelgauge/BatteryInfo.java
index ea8ef8d9..cb4af5b7 100644
--- a/Settings/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/Settings/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -41,6 +41,7 @@ import com.android.settingslib.fuelgauge.Estimate;
import com.android.settingslib.fuelgauge.EstimateKt;
import com.android.settingslib.utils.PowerUtil;
import com.android.settingslib.utils.StringUtil;
+import com.cariad.cea.settings.R;
public class BatteryInfo {
private static final String TAG = "BatteryInfo";
@@ -295,7 +296,7 @@ public class BatteryInfo {
final long startTime = System.currentTimeMillis();
final boolean isCompactStatus =
context.getResources()
- .getBoolean(com.android.settings.R.bool.config_use_compact_battery_status);
+ .getBoolean(R.bool.config_use_compact_battery_status);
BatteryInfo info = new BatteryInfo();
info.mBatteryUsageStats = batteryUsageStats;
info.batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
diff --git a/Settings/src/com/android/settings/fuelgauge/BatteryMeterView.java b/Settings/src/com/android/settings/fuelgauge/BatteryMeterView.java
index a041a31d..14c1aaf4 100644
--- a/Settings/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/Settings/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -24,7 +24,7 @@ import android.widget.ImageView;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.graph.ThemedBatteryDrawable;
diff --git a/Settings/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java b/Settings/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
index dc4aade4..c5896863 100644
--- a/Settings/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
+++ b/Settings/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
@@ -31,7 +31,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
diff --git a/Settings/src/com/android/settings/fuelgauge/BatterySaverController.java b/Settings/src/com/android/settings/fuelgauge/BatterySaverController.java
index 70abfbc4..f768bfe1 100644
--- a/Settings/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/Settings/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -27,7 +27,7 @@ import android.provider.Settings.Global;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/fuelgauge/BatteryUtils.java b/Settings/src/com/android/settings/fuelgauge/BatteryUtils.java
index f846a6c1..ea02fa7e 100644
--- a/Settings/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/Settings/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -42,7 +42,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.annotation.WorkerThread;
import com.android.internal.util.ArrayUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/fuelgauge/HighPowerDetail.java b/Settings/src/com/android/settings/fuelgauge/HighPowerDetail.java
index b2585a6d..aa90bcee 100644
--- a/Settings/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/Settings/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -33,7 +33,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/fuelgauge/InactiveApps.java b/Settings/src/com/android/settings/fuelgauge/InactiveApps.java
index 465a9d84..78319c7b 100644
--- a/Settings/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/Settings/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -38,7 +38,7 @@ import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.Arrays;
diff --git a/Settings/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java b/Settings/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
index 56702cf5..d0cfd17a 100644
--- a/Settings/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
+++ b/Settings/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
@@ -32,7 +32,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/fuelgauge/PowerUsageTimeController.java b/Settings/src/com/android/settings/fuelgauge/PowerUsageTimeController.java
index 0dfdd5d3..7a65cb27 100644
--- a/Settings/src/com/android/settings/fuelgauge/PowerUsageTimeController.java
+++ b/Settings/src/com/android/settings/fuelgauge/PowerUsageTimeController.java
@@ -26,7 +26,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class PowerUsageTimeController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/fuelgauge/PowerUsageTimePreference.java b/Settings/src/com/android/settings/fuelgauge/PowerUsageTimePreference.java
index 16c77701..aaa76cae 100644
--- a/Settings/src/com/android/settings/fuelgauge/PowerUsageTimePreference.java
+++ b/Settings/src/com/android/settings/fuelgauge/PowerUsageTimePreference.java
@@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Custom preference for displaying the app power usage time. */
public class PowerUsageTimePreference extends Preference {
diff --git a/Settings/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/Settings/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index d948cc0f..7fccd0ff 100644
--- a/Settings/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/Settings/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -29,7 +29,7 @@ import android.util.Log;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class RequestIgnoreBatteryOptimizations extends AlertActivity
implements DialogInterface.OnClickListener {
diff --git a/Settings/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/Settings/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
index 9969f246..3625f63b 100644
--- a/Settings/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
@@ -25,7 +25,7 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.fuelgauge.batterytip.AppInfo;
diff --git a/Settings/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/Settings/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
index 82c92dee..2d510a18 100644
--- a/Settings/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
+++ b/Settings/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
@@ -31,7 +31,7 @@ import androidx.preference.CheckBoxPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/Settings/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
index ba292f20..875951ff 100644
--- a/Settings/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/Settings/src/com/android/settings/fuelgauge/SmartBatterySettings.java
index 17334813..a3aefec1 100644
--- a/Settings/src/com/android/settings/fuelgauge/SmartBatterySettings.java
+++ b/Settings/src/com/android/settings/fuelgauge/SmartBatterySettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/Settings/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
index 08d49f1a..a5a307c6 100644
--- a/Settings/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index 5c57c0ca..bc451626 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -28,7 +28,7 @@ import android.provider.SettingsSlicesContract;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.fuelgauge.BatterySaverReceiver;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java
index ebec5cf0..d3b07940 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java
@@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
index 8580f6ec..11637b54 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
@@ -29,7 +29,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.SeekBarPreference;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
index cded470c..8efa97a7 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
@@ -37,7 +37,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
index 8e281de7..ff1c0b01 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
@@ -21,7 +21,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.HelpUtils;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
index dea4e4d6..2b1c17e2 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
@@ -7,7 +7,7 @@ import android.provider.Settings.Global;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/Settings/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java
index 74480032..e7710dca 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java
@@ -23,7 +23,7 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/Settings/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
index 73b7523e..059191e1 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
@@ -31,7 +31,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java b/Settings/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
index 3f8f8e13..452134a4 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
@@ -28,7 +28,7 @@ import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import java.util.List;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/Settings/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
index 55c00313..fc0e2fef 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.fuelgauge.SmartBatterySettings;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
index 37162448..ad7199ec 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
@@ -26,7 +26,7 @@ import android.util.Log;
import androidx.core.app.ActivityCompat;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.CardPreference;
import com.android.settingslib.HelpUtils;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
index 44e4f5ce..ff38cda3 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
@@ -23,7 +23,7 @@ import android.os.Parcelable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java
index 72c710c0..868ca79f 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java
@@ -25,7 +25,7 @@ import android.util.Log;
import androidx.core.app.ActivityCompat;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.CardPreference;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
index 3073d126..e5acae41 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/** Tip to show current battery level is low */
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
index 2b74dd22..29498840 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
@@ -24,7 +24,7 @@ import android.util.ArrayMap;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
index c99653b4..0da2cb39 100644
--- a/Settings/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
+++ b/Settings/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Parcel;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/** Tip to suggest turn on smart battery if it is not on */
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/AnomalyAppItemPreference.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/AnomalyAppItemPreference.java
index 2f139eca..a6976b73 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/AnomalyAppItemPreference.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/AnomalyAppItemPreference.java
@@ -24,7 +24,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
class AnomalyAppItemPreference extends PowerGaugePreference {
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/AnomalyEventWrapper.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/AnomalyEventWrapper.java
index 8924a0b1..3a331939 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/AnomalyEventWrapper.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/AnomalyEventWrapper.java
@@ -21,7 +21,7 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.util.Pair;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
index 51dce26f..c93d0931 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
index 111a5a1c..4ea60d7d 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
@@ -51,7 +51,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.widget.AppCompatImageView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
index 5b05e347..9e3c4ad6 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
@@ -30,7 +30,7 @@ import android.util.Pair;
import androidx.annotation.GuardedBy;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batteryusage.BatteryEntry.NameAndIcon;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
index 4b65cc9c..df8a878e 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
@@ -37,7 +37,7 @@ import android.util.ArrayMap;
import android.util.DebugUtils;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settingslib.Utils;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreference.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreference.java
index 2063f2db..eaba149b 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreference.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreference.java
@@ -23,7 +23,7 @@ import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
/** Custom preference for displaying the battery level as chart graph. */
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java
index bbd10997..71475331 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java
@@ -28,7 +28,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.material.button.MaterialButton;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
index 47c171e2..ac7b0d06 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
@@ -35,7 +35,7 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreference.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreference.java
index fca618be..6d77c468 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreference.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreference.java
@@ -25,7 +25,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.widget.AppPreference;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
index 29839e91..d49e4f5a 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
@@ -33,7 +33,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.fuelgauge.BatteryBroadcastReceiver;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
index 5ef820ca..c500994b 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
@@ -31,7 +31,7 @@ import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.fuelgauge.BatteryHeaderPreferenceController;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java
index fcdd6734..2a819265 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java
@@ -26,7 +26,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatteryUtils;
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
index 2bcc7bfd..667424ce 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
@@ -27,7 +27,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.SettingsSpinnerAdapter;
/** A preference which contains a spinner. */
diff --git a/Settings/src/com/android/settings/fuelgauge/batteryusage/TextViewPreference.java b/Settings/src/com/android/settings/fuelgauge/batteryusage/TextViewPreference.java
index b20ef39f..77a5cff6 100644
--- a/Settings/src/com/android/settings/fuelgauge/batteryusage/TextViewPreference.java
+++ b/Settings/src/com/android/settings/fuelgauge/batteryusage/TextViewPreference.java
@@ -24,7 +24,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** A preference for a single text view. */
public class TextViewPreference extends Preference {
diff --git a/Settings/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java b/Settings/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java
index b3a72d0b..0188efed 100644
--- a/Settings/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java
+++ b/Settings/src/com/android/settings/gestures/BackGestureIndicatorDrawable.java
@@ -32,7 +32,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** A drawable to animate the inset back gesture in both edges of the screen */
public class BackGestureIndicatorDrawable extends Drawable {
diff --git a/Settings/src/com/android/settings/gestures/BackGestureIndicatorView.java b/Settings/src/com/android/settings/gestures/BackGestureIndicatorView.java
index c60afd00..f74783c6 100644
--- a/Settings/src/com/android/settings/gestures/BackGestureIndicatorView.java
+++ b/Settings/src/com/android/settings/gestures/BackGestureIndicatorView.java
@@ -26,7 +26,7 @@ import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A linear layout containing the left and right location indicators.
diff --git a/Settings/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java b/Settings/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
index 4c5e28c9..5a1209b6 100644
--- a/Settings/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
+++ b/Settings/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
@@ -22,7 +22,7 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVE
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/gestures/ButtonNavigationSettingsFragment.java b/Settings/src/com/android/settings/gestures/ButtonNavigationSettingsFragment.java
index af75e788..0a0e833f 100644
--- a/Settings/src/com/android/settings/gestures/ButtonNavigationSettingsFragment.java
+++ b/Settings/src/com/android/settings/gestures/ButtonNavigationSettingsFragment.java
@@ -22,7 +22,7 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVE
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/Settings/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index 577758df..ccab9045 100644
--- a/Settings/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/Settings/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/Settings/src/com/android/settings/gestures/DoubleTapScreenSettings.java
index 5eea3d68..773b313e 100644
--- a/Settings/src/com/android/settings/gestures/DoubleTapScreenSettings.java
+++ b/Settings/src/com/android/settings/gestures/DoubleTapScreenSettings.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.display.AmbientDisplayConfiguration;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/Settings/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
index 27854833..82158735 100644
--- a/Settings/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
+++ b/Settings/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/Settings/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
index f545edec..fded8e0c 100644
--- a/Settings/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
@@ -28,7 +28,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
public class DoubleTwistPreferenceController extends GesturePreferenceController {
diff --git a/Settings/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java b/Settings/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
index 159f4795..c416eeb6 100644
--- a/Settings/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
+++ b/Settings/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
@@ -19,7 +19,7 @@ package com.android.settings.gestures;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java b/Settings/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
index 546581bd..5d2e9561 100644
--- a/Settings/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
+++ b/Settings/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
@@ -24,7 +24,7 @@ import android.os.Bundle;
import android.provider.Settings;
import android.view.WindowManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.LabeledSeekBarPreference;
diff --git a/Settings/src/com/android/settings/gestures/GesturePreferenceController.java b/Settings/src/com/android/settings/gestures/GesturePreferenceController.java
index 71c3c9ac..19c08af5 100644
--- a/Settings/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/gestures/GestureSettings.java b/Settings/src/com/android/settings/gestures/GestureSettings.java
index 8532b162..5cbfb422 100644
--- a/Settings/src/com/android/settings/gestures/GestureSettings.java
+++ b/Settings/src/com/android/settings/gestures/GestureSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.display.AmbientDisplayConfiguration;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/gestures/LongPressPowerFooterPreferenceController.java b/Settings/src/com/android/settings/gestures/LongPressPowerFooterPreferenceController.java
index b4f6def4..bef9e65d 100644
--- a/Settings/src/com/android/settings/gestures/LongPressPowerFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/LongPressPowerFooterPreferenceController.java
@@ -26,7 +26,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/** Configures the behaviour of long press power footer. */
diff --git a/Settings/src/com/android/settings/gestures/LongPressPowerForAssistantPreferenceController.java b/Settings/src/com/android/settings/gestures/LongPressPowerForAssistantPreferenceController.java
index 4a0ad74a..da86afbc 100644
--- a/Settings/src/com/android/settings/gestures/LongPressPowerForAssistantPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/LongPressPowerForAssistantPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/gestures/LongPressPowerForPowerMenuPreferenceController.java b/Settings/src/com/android/settings/gestures/LongPressPowerForPowerMenuPreferenceController.java
index c11f0e4f..0c398462 100644
--- a/Settings/src/com/android/settings/gestures/LongPressPowerForPowerMenuPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/LongPressPowerForPowerMenuPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/gestures/LongPressPowerIllustrationPreferenceController.java b/Settings/src/com/android/settings/gestures/LongPressPowerIllustrationPreferenceController.java
index b3db9e78..6e295231 100644
--- a/Settings/src/com/android/settings/gestures/LongPressPowerIllustrationPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/LongPressPowerIllustrationPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.IllustrationPreference;
diff --git a/Settings/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java b/Settings/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
index 6aac7723..db5d1e3f 100644
--- a/Settings/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
@@ -22,7 +22,7 @@ import android.net.Uri;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java b/Settings/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java
index 3f84aba4..d6d4eb79 100644
--- a/Settings/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java
@@ -21,7 +21,7 @@ import android.net.Uri;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/gestures/OneHandedPreferenceCategoryController.java b/Settings/src/com/android/settings/gestures/OneHandedPreferenceCategoryController.java
index 96232993..f53e72c8 100644
--- a/Settings/src/com/android/settings/gestures/OneHandedPreferenceCategoryController.java
+++ b/Settings/src/com/android/settings/gestures/OneHandedPreferenceCategoryController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/gestures/OneHandedSettings.java b/Settings/src/com/android/settings/gestures/OneHandedSettings.java
index c84b9ea6..e19eba64 100644
--- a/Settings/src/com/android/settings/gestures/OneHandedSettings.java
+++ b/Settings/src/com/android/settings/gestures/OneHandedSettings.java
@@ -25,7 +25,7 @@ import android.os.UserHandle;
import android.util.Log;
import com.android.internal.accessibility.AccessibilityShortcutController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/gestures/PickupGestureSettings.java b/Settings/src/com/android/settings/gestures/PickupGestureSettings.java
index bfda405b..43139782 100644
--- a/Settings/src/com/android/settings/gestures/PickupGestureSettings.java
+++ b/Settings/src/com/android/settings/gestures/PickupGestureSettings.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.display.AmbientDisplayConfiguration;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/gestures/PowerMenuPreferenceController.java b/Settings/src/com/android/settings/gestures/PowerMenuPreferenceController.java
index 599dd18b..4d4acb46 100644
--- a/Settings/src/com/android/settings/gestures/PowerMenuPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/PowerMenuPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.gestures;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class PowerMenuPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/gestures/PowerMenuSettings.java b/Settings/src/com/android/settings/gestures/PowerMenuSettings.java
index 6a8458db..bb7f7fef 100644
--- a/Settings/src/com/android/settings/gestures/PowerMenuSettings.java
+++ b/Settings/src/com/android/settings/gestures/PowerMenuSettings.java
@@ -18,7 +18,7 @@ package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java b/Settings/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
index d171677d..1bd1c68f 100644
--- a/Settings/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
@@ -28,7 +28,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/Settings/src/com/android/settings/gestures/PreventRingingGestureSettings.java
index d327b712..a6ba4eca 100644
--- a/Settings/src/com/android/settings/gestures/PreventRingingGestureSettings.java
+++ b/Settings/src/com/android/settings/gestures/PreventRingingGestureSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java b/Settings/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
index 03b02594..96ce607b 100644
--- a/Settings/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
@@ -30,7 +30,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java b/Settings/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
index 9c0e0bff..f83aca37 100644
--- a/Settings/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.MainSwitchPreference;
diff --git a/Settings/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/Settings/src/com/android/settings/gestures/SwipeToNotificationSettings.java
index 953603a8..61bce638 100644
--- a/Settings/src/com/android/settings/gestures/SwipeToNotificationSettings.java
+++ b/Settings/src/com/android/settings/gestures/SwipeToNotificationSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/Settings/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index c40212b7..e3a45450 100644
--- a/Settings/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/Settings/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -41,7 +41,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityGestureNavigationTutorial;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
diff --git a/Settings/src/com/android/settings/gestures/SystemNavigationPreferenceController.java b/Settings/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
index ccdb2577..299da8f4 100644
--- a/Settings/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
+++ b/Settings/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
@@ -24,7 +24,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class SystemNavigationPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/gestures/TapScreenGestureSettings.java b/Settings/src/com/android/settings/gestures/TapScreenGestureSettings.java
index 773ef0ef..65257a82 100644
--- a/Settings/src/com/android/settings/gestures/TapScreenGestureSettings.java
+++ b/Settings/src/com/android/settings/gestures/TapScreenGestureSettings.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.display.AmbientDisplayConfiguration;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/homepage/SettingsHomepageActivity.java b/Settings/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 5f091d99..599e966c 100644
--- a/Settings/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/Settings/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -63,7 +63,6 @@ import androidx.window.embedding.SplitInfo;
import androidx.window.embedding.SplitRule;
import androidx.window.java.embedding.SplitControllerCallbackAdapter;
-import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsApplication;
@@ -78,6 +77,7 @@ import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
import com.android.settingslib.Utils;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.util.WizardManagerHelper;
import java.net.URISyntaxException;
diff --git a/Settings/src/com/android/settings/homepage/TopLevelSettings.java b/Settings/src/com/android/settings/homepage/TopLevelSettings.java
index d1fa7601..93740799 100644
--- a/Settings/src/com/android/settings/homepage/TopLevelSettings.java
+++ b/Settings/src/com/android/settings/homepage/TopLevelSettings.java
@@ -38,7 +38,7 @@ import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
import androidx.window.embedding.ActivityEmbeddingController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/CardContentProvider.java b/Settings/src/com/android/settings/homepage/contextualcards/CardContentProvider.java
index 7ad55061..1763c8ed 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/CardContentProvider.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/CardContentProvider.java
@@ -31,7 +31,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.ThreadUtils;
import java.util.Map;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardFeedbackDialog.java b/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardFeedbackDialog.java
index 0d5b2758..53071543 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardFeedbackDialog.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardFeedbackDialog.java
@@ -24,7 +24,7 @@ import android.util.Log;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class ContextualCardFeedbackDialog extends AlertActivity implements
DialogInterface.OnClickListener {
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
index ebafbaf7..28d9dd8e 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
@@ -32,7 +32,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java b/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
index 8b8b33f4..441e5d8a 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
@@ -38,7 +38,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.FeatureFlags;
import com.android.settings.homepage.contextualcards.conditional.ConditionalCardController;
import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java b/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
index a66e0663..c19eef82 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
@@ -35,7 +35,7 @@ import androidx.loader.app.LoaderManager;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.ItemTouchHelper;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.homepage.contextualcards.slices.BluetoothUpdateWorker;
import com.android.settings.homepage.contextualcards.slices.SwipeDismissalDelegate;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/FaceReEnrollDialog.java b/Settings/src/com/android/settings/homepage/contextualcards/FaceReEnrollDialog.java
index a8239241..d4673dc9 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/FaceReEnrollDialog.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/FaceReEnrollDialog.java
@@ -28,7 +28,7 @@ import android.util.Log;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.face.FaceUpdater;
import com.android.settings.homepage.contextualcards.slices.FaceSetupSlice;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
index 8bd30281..51fee339 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
@@ -24,7 +24,7 @@ import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settingslib.WirelessUtils;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java
index 419e5c6f..cf8aca42 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.NetworkPolicyManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.homepage.contextualcards.ContextualCard;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
index 416b6908..c9fc6cdb 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
@@ -22,7 +22,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.PowerManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.fuelgauge.BatterySaverReceiver;
import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
index 9c936b9c..6d8f30f2 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
@@ -24,7 +24,7 @@ import android.telephony.PreciseDataConnectionState;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.network.GlobalSettingsChangeListener;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
index 732ec735..36766c35 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
@@ -27,7 +27,7 @@ import android.widget.TextView;
import androidx.annotation.LayoutRes;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
index 83f7ede2..74514385 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
@@ -23,7 +23,7 @@ import android.view.View;
import androidx.annotation.LayoutRes;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
index 25a444f1..77f7cf95 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
@@ -26,7 +26,7 @@ import android.widget.LinearLayout;
import androidx.annotation.LayoutRes;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
index e69a336e..646a70b7 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
@@ -28,7 +28,7 @@ import android.service.notification.ZenModeConfig;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.notification.zen.ZenModeSettings;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java
index f8476123..76db7793 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java
@@ -26,7 +26,7 @@ import android.hardware.display.ColorDisplayManager;
import android.os.UserHandle;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import java.net.URISyntaxException;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
index 2a08a1ba..9f0a87ff 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
@@ -27,7 +27,7 @@ import android.net.wifi.WifiManager;
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.network.tether.TetherSettings;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java
index 82bec0b4..ba4dbd67 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.hardware.display.NightDisplayListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.display.NightDisplaySettings;
import com.android.settings.homepage.contextualcards.ContextualCard;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
index f800f920..188cf72b 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.media.AudioManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import java.util.Objects;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java
index c1931166..94e35230 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.media.AudioManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import java.util.Objects;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java b/Settings/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
index beef59f2..e1e5bfd4 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
@@ -29,7 +29,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.homepage.contextualcards.ContextualCard;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java b/Settings/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java
index b0061fa8..f6e1e2d2 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java
@@ -25,7 +25,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardController;
import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java b/Settings/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
index 395e8146..08fb66a3 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
@@ -24,7 +24,7 @@ import android.widget.TextView;
import androidx.annotation.LayoutRes;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardController;
import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index f1f9521b..e58cd5de 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -34,7 +34,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
index 2291bd73..6740bbc6 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
@@ -33,7 +33,7 @@ import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.display.ScreenTimeoutSettings;
import com.android.settings.slices.CustomSliceable;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
index 974af9fe..9d5efc5a 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
@@ -40,7 +40,7 @@ import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.slices.CustomSliceRegistry;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
index 7cf7d869..e93177b6 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
@@ -32,7 +32,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
index 22e34317..f8276c1e 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
@@ -30,7 +30,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.deviceinfo.StorageDashboardFragment;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
index b348d3a5..a73e069c 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardController;
import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
index c9ec5cf8..37f41953 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
@@ -42,7 +42,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.slice.Slice;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.CardContentProvider;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
index ff3f0fde..610a67a8 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.slice.Slice;
import androidx.slice.widget.SliceView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java
index c881232c..7e60b8a6 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java
@@ -31,7 +31,7 @@ import androidx.slice.SliceMetadata;
import androidx.slice.core.SliceAction;
import androidx.slice.widget.EventInfo;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegate.java b/Settings/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegate.java
index 18135904..d365c4fd 100644
--- a/Settings/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegate.java
+++ b/Settings/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegate.java
@@ -23,7 +23,7 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
public class SwipeDismissalDelegate extends ItemTouchHelper.Callback {
diff --git a/Settings/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/Settings/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
index 7e275292..fa767380 100644
--- a/Settings/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
@@ -28,7 +28,7 @@ import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
diff --git a/Settings/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/Settings/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
index 751dac78..dd598748 100644
--- a/Settings/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -24,7 +24,7 @@ import android.view.InputDevice;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/Settings/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 38df8d76..652e6067 100644
--- a/Settings/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/Settings/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -22,7 +22,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
public class InputMethodAndSubtypeEnabler extends DashboardFragment {
diff --git a/Settings/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/Settings/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
index 54c608cf..f9c785ca 100644
--- a/Settings/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
@@ -41,7 +41,7 @@ import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.AsyncTaskLoader;
import androidx.loader.content.Loader;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/Settings/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
index 8abde7e3..044aa02b 100644
--- a/Settings/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.hardware.input.InputDeviceIdentifier;
import android.hardware.input.InputManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
public class KeyboardLayoutPickerFragment extends DashboardFragment {
diff --git a/Settings/src/com/android/settings/inputmethod/KeyboardPreferenceController.java b/Settings/src/com/android/settings/inputmethod/KeyboardPreferenceController.java
index 26b07d82..2d13b4fd 100644
--- a/Settings/src/com/android/settings/inputmethod/KeyboardPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/KeyboardPreferenceController.java
@@ -22,7 +22,7 @@ import android.util.FeatureFlagUtils;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo;
diff --git a/Settings/src/com/android/settings/inputmethod/KeyboardSettings.java b/Settings/src/com/android/settings/inputmethod/KeyboardSettings.java
index 9fddb932..442fdd87 100644
--- a/Settings/src/com/android/settings/inputmethod/KeyboardSettings.java
+++ b/Settings/src/com/android/settings/inputmethod/KeyboardSettings.java
@@ -28,7 +28,7 @@ import android.util.FeatureFlagUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.language.PointerSpeedController;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java b/Settings/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java
index fa7b372d..cfd0a58f 100644
--- a/Settings/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java
@@ -45,7 +45,7 @@ import androidx.core.graphics.drawable.DrawableCompat;
import androidx.fragment.app.DialogFragment;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java b/Settings/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java
index 5a5b69e4..2c2fe268 100644
--- a/Settings/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
diff --git a/Settings/src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java b/Settings/src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java
index d49fbd1c..0cc4c547 100644
--- a/Settings/src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java
@@ -31,7 +31,7 @@ import android.widget.Button;
import androidx.fragment.app.DialogFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java b/Settings/src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java
index 4bb10691..fafae55e 100644
--- a/Settings/src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java
@@ -26,7 +26,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.Utils;
diff --git a/Settings/src/com/android/settings/inputmethod/ModifierKeysSettings.java b/Settings/src/com/android/settings/inputmethod/ModifierKeysSettings.java
index f1745980..71af6da8 100644
--- a/Settings/src/com/android/settings/inputmethod/ModifierKeysSettings.java
+++ b/Settings/src/com/android/settings/inputmethod/ModifierKeysSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.util.FeatureFlagUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
index 2bbb5676..607ea87f 100644
--- a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
@@ -35,7 +35,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerContent.java b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerContent.java
index e9349644..ed433e99 100644
--- a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerContent.java
+++ b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerContent.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.hardware.input.InputDeviceIdentifier;
import android.hardware.input.InputManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
public class NewKeyboardLayoutPickerContent extends DashboardFragment {
diff --git a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java
index ec727e8a..3af42fd5 100644
--- a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java
+++ b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java
@@ -30,7 +30,7 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.TickButtonPreference;
diff --git a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java
index 674b5bf7..4d83f9fc 100644
--- a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
import androidx.fragment.app.Fragment;
import com.android.hardware.input.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
//TODO: b/316243168 - [Physical Keyboard Setting] Refactor NewKeyboardLayoutPickerFragment
diff --git a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerTitle.java b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerTitle.java
index 7f878269..f760613f 100644
--- a/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerTitle.java
+++ b/Settings/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerTitle.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java b/Settings/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
index 8f1e5c88..985069ef 100644
--- a/Settings/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
+++ b/Settings/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
@@ -36,7 +36,7 @@ import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Arrays;
import java.util.Comparator;
diff --git a/Settings/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/Settings/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index e102241f..a722e67d 100644
--- a/Settings/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -46,7 +46,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.internal.util.Preconditions;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/Settings/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
index b88928ca..1271262d 100644
--- a/Settings/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
@@ -26,7 +26,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java b/Settings/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java
index 5e04a06b..47a060cf 100644
--- a/Settings/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.inputmethod;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/Settings/src/com/android/settings/inputmethod/SpellCheckerPreference.java
index b8028fe5..51bb12aa 100644
--- a/Settings/src/com/android/settings/inputmethod/SpellCheckerPreference.java
+++ b/Settings/src/com/android/settings/inputmethod/SpellCheckerPreference.java
@@ -30,7 +30,7 @@ import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.CustomListPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Spell checker service preference.
diff --git a/Settings/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/Settings/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
index f0bb8d98..a6817f49 100644
--- a/Settings/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
@@ -23,7 +23,7 @@ import android.view.textservice.TextServicesManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtilCompat;
diff --git a/Settings/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/Settings/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index b4d75709..3d55c489 100644
--- a/Settings/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/Settings/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -34,7 +34,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SettingsMainSwitchBar;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java b/Settings/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
index d410a1ba..fb32a035 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.input.InputSettings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadGestureDialogFragment.java b/Settings/src/com/android/settings/inputmethod/TrackpadGestureDialogFragment.java
index 1a90376b..54b1f0bf 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadGestureDialogFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadGestureDialogFragment.java
@@ -40,7 +40,7 @@ import android.widget.ImageView;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceController.java b/Settings/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceController.java
index 36fb0c07..9ddaf663 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceController.java b/Settings/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceController.java
index dbc706ee..13e18e60 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceController.java b/Settings/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceController.java
index d430e4d4..1ce64b84 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceController.java b/Settings/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceController.java
index 44a56e72..5efdc9e7 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java b/Settings/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
index 042126da..7a810fb7 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.input.InputSettings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadSettings.java b/Settings/src/com/android/settings/inputmethod/TrackpadSettings.java
index 49559333..6faf8141 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadSettings.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.util.FeatureFlagUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceController.java b/Settings/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceController.java
index 2b11411c..c366d28a 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java b/Settings/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
index f78c81e2..be1f6101 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.input.InputSettings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java b/Settings/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
index 9a4b90f4..9a2f3aed 100644
--- a/Settings/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
+++ b/Settings/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.util.FeatureFlagUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index d4579395..6e905613 100644
--- a/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -24,7 +24,7 @@ import android.os.Messenger;
import android.os.RemoteException;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class UserDictionaryAddWordActivity extends Activity {
diff --git a/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
index 716226db..1567fb35 100644
--- a/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -26,7 +26,7 @@ import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
index dc2aa49f..b87e3f68 100644
--- a/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
+++ b/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -26,7 +26,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
diff --git a/Settings/src/com/android/settings/inputmethod/UserDictionaryList.java b/Settings/src/com/android/settings/inputmethod/UserDictionaryList.java
index a003f96b..3890178a 100644
--- a/Settings/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/Settings/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -22,7 +22,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
diff --git a/Settings/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java b/Settings/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
index 9343493d..fcf67d22 100644
--- a/Settings/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/inputmethod/UserDictionarySettings.java b/Settings/src/com/android/settings/inputmethod/UserDictionarySettings.java
index 16a2299c..3e14b08e 100644
--- a/Settings/src/com/android/settings/inputmethod/UserDictionarySettings.java
+++ b/Settings/src/com/android/settings/inputmethod/UserDictionarySettings.java
@@ -43,7 +43,7 @@ import androidx.fragment.app.ListFragment;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.Instrumentable;
diff --git a/Settings/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java b/Settings/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
index 6138850e..baad3a6d 100644
--- a/Settings/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
+++ b/Settings/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
@@ -19,7 +19,7 @@ package com.android.settings.inputmethod;
import android.content.Context;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import java.util.Locale;
diff --git a/Settings/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java b/Settings/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java
index 9aa65f0b..fa177d62 100644
--- a/Settings/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.inputmethod;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public final class VirtualKeyboardForWorkPreferenceController
diff --git a/Settings/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/Settings/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
index e6de7a5e..a1cf20d9 100644
--- a/Settings/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
+++ b/Settings/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
@@ -26,7 +26,7 @@ import android.view.inputmethod.InputMethodManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/language/DefaultVoiceInputPicker.java b/Settings/src/com/android/settings/language/DefaultVoiceInputPicker.java
index 8a73fdf3..d3283926 100644
--- a/Settings/src/com/android/settings/language/DefaultVoiceInputPicker.java
+++ b/Settings/src/com/android/settings/language/DefaultVoiceInputPicker.java
@@ -24,7 +24,7 @@ import android.content.pm.PackageManager;
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
diff --git a/Settings/src/com/android/settings/language/LanguageAndInputSettings.java b/Settings/src/com/android/settings/language/LanguageAndInputSettings.java
index f40473c9..20efd454 100644
--- a/Settings/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/Settings/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -29,7 +29,7 @@ import android.util.FeatureFlagUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.inputmethod.PhysicalKeyboardPreferenceController;
import com.android.settings.inputmethod.SpellCheckerPreferenceController;
diff --git a/Settings/src/com/android/settings/language/LanguageSettings.java b/Settings/src/com/android/settings/language/LanguageSettings.java
index 82533115..198349be 100644
--- a/Settings/src/com/android/settings/language/LanguageSettings.java
+++ b/Settings/src/com/android/settings/language/LanguageSettings.java
@@ -24,7 +24,7 @@ import android.util.FeatureFlagUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.PreferenceCategoryController;
diff --git a/Settings/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/Settings/src/com/android/settings/language/PhoneLanguagePreferenceController.java
index 3a382e40..85c998b2 100644
--- a/Settings/src/com/android/settings/language/PhoneLanguagePreferenceController.java
+++ b/Settings/src/com/android/settings/language/PhoneLanguagePreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/language/PointerSpeedController.java b/Settings/src/com/android/settings/language/PointerSpeedController.java
index 67326dda..30e0d8df 100644
--- a/Settings/src/com/android/settings/language/PointerSpeedController.java
+++ b/Settings/src/com/android/settings/language/PointerSpeedController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/language/TtsPreferenceController.java b/Settings/src/com/android/settings/language/TtsPreferenceController.java
index 285f69ba..882f18c4 100644
--- a/Settings/src/com/android/settings/language/TtsPreferenceController.java
+++ b/Settings/src/com/android/settings/language/TtsPreferenceController.java
@@ -21,7 +21,7 @@ import android.speech.tts.TtsEngines;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class TtsPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/Settings/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index b284c8d7..bcdcbf87 100644
--- a/Settings/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/Settings/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -42,7 +42,7 @@ import androidx.core.view.ViewCompat;
import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppLocaleUtil;
import com.android.settings.applications.appinfo.AppLocaleDetails;
import com.android.settings.core.SettingsBaseActivity;
diff --git a/Settings/src/com/android/settings/localepicker/LocaleDialogFragment.java b/Settings/src/com/android/settings/localepicker/LocaleDialogFragment.java
index 91cbc87e..25b8c35a 100644
--- a/Settings/src/com/android/settings/localepicker/LocaleDialogFragment.java
+++ b/Settings/src/com/android/settings/localepicker/LocaleDialogFragment.java
@@ -38,7 +38,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.app.LocaleStore;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/Settings/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
index 24d99275..f56fa989 100644
--- a/Settings/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
+++ b/Settings/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
@@ -38,7 +38,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.app.LocalePicker;
import com.android.internal.app.LocaleStore;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.shortcut.ShortcutsUpdateTask;
diff --git a/Settings/src/com/android/settings/localepicker/LocaleDragCell.java b/Settings/src/com/android/settings/localepicker/LocaleDragCell.java
index d0b7cfb1..23da7559 100644
--- a/Settings/src/com/android/settings/localepicker/LocaleDragCell.java
+++ b/Settings/src/com/android/settings/localepicker/LocaleDragCell.java
@@ -23,7 +23,7 @@ import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
class LocaleDragCell extends RelativeLayout {
// We need to keep the label and the checkbox "in sync"
diff --git a/Settings/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java b/Settings/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java
index b962b9e8..fd435d29 100644
--- a/Settings/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java
+++ b/Settings/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java
@@ -24,7 +24,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/Settings/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
index 59a5fb0a..450c36ef 100644
--- a/Settings/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
+++ b/Settings/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
@@ -24,7 +24,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Add accessibility actions to the drag-and-drop locale list
diff --git a/Settings/src/com/android/settings/localepicker/LocaleListEditor.java b/Settings/src/com/android/settings/localepicker/LocaleListEditor.java
index b09e22cc..1fb41cdc 100644
--- a/Settings/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/Settings/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -51,7 +51,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.app.LocalePicker;
import com.android.internal.app.LocaleStore;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java b/Settings/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
index b8c80f33..6752ad56 100644
--- a/Settings/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
+++ b/Settings/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
@@ -28,7 +28,7 @@ import androidx.core.view.ViewCompat;
import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SettingsBaseActivity;
/** A activity to show the locale picker page. */
diff --git a/Settings/src/com/android/settings/localepicker/TermsOfAddressCategoryController.java b/Settings/src/com/android/settings/localepicker/TermsOfAddressCategoryController.java
index 518f670c..6de66969 100644
--- a/Settings/src/com/android/settings/localepicker/TermsOfAddressCategoryController.java
+++ b/Settings/src/com/android/settings/localepicker/TermsOfAddressCategoryController.java
@@ -27,7 +27,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.app.LocaleStore;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.PreferenceCategoryController;
import java.util.Arrays;
diff --git a/Settings/src/com/android/settings/localepicker/TermsOfAddressController.java b/Settings/src/com/android/settings/localepicker/TermsOfAddressController.java
index 18fa3ef1..5ca416b1 100644
--- a/Settings/src/com/android/settings/localepicker/TermsOfAddressController.java
+++ b/Settings/src/com/android/settings/localepicker/TermsOfAddressController.java
@@ -24,7 +24,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.app.LocaleStore;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.Arrays;
diff --git a/Settings/src/com/android/settings/localepicker/TermsOfAddressFragment.java b/Settings/src/com/android/settings/localepicker/TermsOfAddressFragment.java
index 9484846a..dcbac240 100644
--- a/Settings/src/com/android/settings/localepicker/TermsOfAddressFragment.java
+++ b/Settings/src/com/android/settings/localepicker/TermsOfAddressFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.localepicker;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/location/AppLocationPermissionPreferenceController.java b/Settings/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
index 37bbd08f..e0494d24 100644
--- a/Settings/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
+++ b/Settings/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
@@ -13,7 +13,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/location/BluetoothScanningFragment.java b/Settings/src/com/android/settings/location/BluetoothScanningFragment.java
index 01c22d55..25380ac0 100644
--- a/Settings/src/com/android/settings/location/BluetoothScanningFragment.java
+++ b/Settings/src/com/android/settings/location/BluetoothScanningFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.location;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java b/Settings/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
index c975a410..9030a64d 100644
--- a/Settings/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
@@ -23,7 +23,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.widget.MainSwitchPreference;
diff --git a/Settings/src/com/android/settings/location/LocationForWorkPreferenceController.java b/Settings/src/com/android/settings/location/LocationForWorkPreferenceController.java
index dc4d1d91..f45effbe 100644
--- a/Settings/src/com/android/settings/location/LocationForWorkPreferenceController.java
+++ b/Settings/src/com/android/settings/location/LocationForWorkPreferenceController.java
@@ -22,7 +22,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/src/com/android/settings/location/LocationIndicatorsPreferenceController.java b/Settings/src/com/android/settings/location/LocationIndicatorsPreferenceController.java
index 75ffb3a9..86a03e3a 100644
--- a/Settings/src/com/android/settings/location/LocationIndicatorsPreferenceController.java
+++ b/Settings/src/com/android/settings/location/LocationIndicatorsPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.provider.DeviceConfig;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
diff --git a/Settings/src/com/android/settings/location/LocationPersonalSettings.java b/Settings/src/com/android/settings/location/LocationPersonalSettings.java
index 128ec762..8f2b046e 100644
--- a/Settings/src/com/android/settings/location/LocationPersonalSettings.java
+++ b/Settings/src/com/android/settings/location/LocationPersonalSettings.java
@@ -19,7 +19,7 @@ package com.android.settings.location;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
diff --git a/Settings/src/com/android/settings/location/LocationServices.java b/Settings/src/com/android/settings/location/LocationServices.java
index 52e958cb..bd74edd4 100644
--- a/Settings/src/com/android/settings/location/LocationServices.java
+++ b/Settings/src/com/android/settings/location/LocationServices.java
@@ -19,7 +19,7 @@ package com.android.settings.location;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java b/Settings/src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java
index ccda5722..111b68cc 100644
--- a/Settings/src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java
+++ b/Settings/src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/src/com/android/settings/location/LocationServicesForWork.java b/Settings/src/com/android/settings/location/LocationServicesForWork.java
index f61918e8..8120285a 100644
--- a/Settings/src/com/android/settings/location/LocationServicesForWork.java
+++ b/Settings/src/com/android/settings/location/LocationServicesForWork.java
@@ -19,7 +19,7 @@ package com.android.settings.location;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
/**
diff --git a/Settings/src/com/android/settings/location/LocationServicesPreferenceController.java b/Settings/src/com/android/settings/location/LocationServicesPreferenceController.java
index bab8bc8d..8323f89b 100644
--- a/Settings/src/com/android/settings/location/LocationServicesPreferenceController.java
+++ b/Settings/src/com/android/settings/location/LocationServicesPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.location;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java b/Settings/src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java
index 2814f9d7..5ce06a46 100644
--- a/Settings/src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java
+++ b/Settings/src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java
@@ -21,7 +21,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/src/com/android/settings/location/LocationSettings.java b/Settings/src/com/android/settings/location/LocationSettings.java
index 7bb02285..06a36f03 100644
--- a/Settings/src/com/android/settings/location/LocationSettings.java
+++ b/Settings/src/com/android/settings/location/LocationSettings.java
@@ -32,7 +32,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/location/LocationSettingsFooterPreferenceController.java b/Settings/src/com/android/settings/location/LocationSettingsFooterPreferenceController.java
index 05d153c4..8a3dc482 100644
--- a/Settings/src/com/android/settings/location/LocationSettingsFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/location/LocationSettingsFooterPreferenceController.java
@@ -30,7 +30,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/location/LocationSlice.java b/Settings/src/com/android/settings/location/LocationSlice.java
index 291e5e45..f8f59277 100644
--- a/Settings/src/com/android/settings/location/LocationSlice.java
+++ b/Settings/src/com/android/settings/location/LocationSlice.java
@@ -34,7 +34,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.slices.CustomSliceRegistry;
diff --git a/Settings/src/com/android/settings/location/LocationWorkProfileSettings.java b/Settings/src/com/android/settings/location/LocationWorkProfileSettings.java
index d8db33da..8e1905f3 100644
--- a/Settings/src/com/android/settings/location/LocationWorkProfileSettings.java
+++ b/Settings/src/com/android/settings/location/LocationWorkProfileSettings.java
@@ -22,7 +22,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
diff --git a/Settings/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/Settings/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index 61682d00..c3020517 100644
--- a/Settings/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/Settings/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -29,7 +29,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settingslib.applications.RecentAppOpsAccess;
diff --git a/Settings/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java b/Settings/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java
index 0ea9ffbd..ec46410a 100644
--- a/Settings/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java
+++ b/Settings/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java
@@ -25,7 +25,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java b/Settings/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java
index 998e6f3f..239b6fb0 100644
--- a/Settings/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java
+++ b/Settings/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java
@@ -27,7 +27,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.applications.RecentAppOpsAccess;
diff --git a/Settings/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/Settings/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
index 39211ee5..6a9a6f99 100644
--- a/Settings/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
+++ b/Settings/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
@@ -26,7 +26,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/Settings/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
index e0e3f9aa..4e6b49d7 100644
--- a/Settings/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
+++ b/Settings/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
@@ -24,7 +24,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.widget.AppPreference;
diff --git a/Settings/src/com/android/settings/location/TopLevelLocationPreferenceController.java b/Settings/src/com/android/settings/location/TopLevelLocationPreferenceController.java
index 5c1043a4..b2aabef7 100644
--- a/Settings/src/com/android/settings/location/TopLevelLocationPreferenceController.java
+++ b/Settings/src/com/android/settings/location/TopLevelLocationPreferenceController.java
@@ -15,7 +15,7 @@ import android.permission.PermissionControllerManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/location/WifiScanningFragment.java b/Settings/src/com/android/settings/location/WifiScanningFragment.java
index 6188c027..b4dd4f23 100644
--- a/Settings/src/com/android/settings/location/WifiScanningFragment.java
+++ b/Settings/src/com/android/settings/location/WifiScanningFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.location;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java b/Settings/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
index 9f19a703..eb12b16d 100644
--- a/Settings/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
@@ -23,7 +23,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.widget.MainSwitchPreference;
diff --git a/Settings/src/com/android/settings/media/BluetoothPairingReceiver.java b/Settings/src/com/android/settings/media/BluetoothPairingReceiver.java
index 1ec99b00..1228a1d2 100644
--- a/Settings/src/com/android/settings/media/BluetoothPairingReceiver.java
+++ b/Settings/src/com/android/settings/media/BluetoothPairingReceiver.java
@@ -22,7 +22,7 @@ import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.BluetoothPairingDetail;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.media.MediaOutputConstants;
diff --git a/Settings/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/Settings/src/com/android/settings/media/MediaOutputIndicatorSlice.java
index bb075c2f..e96ffbcb 100644
--- a/Settings/src/com/android/settings/media/MediaOutputIndicatorSlice.java
+++ b/Settings/src/com/android/settings/media/MediaOutputIndicatorSlice.java
@@ -33,7 +33,7 @@ import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.slices.CustomSliceable;
import com.android.settings.slices.SliceBackgroundWorker;
diff --git a/Settings/src/com/android/settings/media/RemoteMediaSlice.java b/Settings/src/com/android/settings/media/RemoteMediaSlice.java
index cebc14f4..31723657 100644
--- a/Settings/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/Settings/src/com/android/settings/media/RemoteMediaSlice.java
@@ -38,7 +38,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.InputRangeBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.notification.SoundSettings;
diff --git a/Settings/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java b/Settings/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
index a938515b..d6e6d2d2 100644
--- a/Settings/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
+++ b/Settings/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/network/AdaptiveConnectivitySettings.java b/Settings/src/com/android/settings/network/AdaptiveConnectivitySettings.java
index 5e1dc124..860ec71a 100644
--- a/Settings/src/com/android/settings/network/AdaptiveConnectivitySettings.java
+++ b/Settings/src/com/android/settings/network/AdaptiveConnectivitySettings.java
@@ -17,7 +17,7 @@ package com.android.settings.network;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java b/Settings/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
index ea849f65..ee0d9d49 100644
--- a/Settings/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
/**
diff --git a/Settings/src/com/android/settings/network/AirplaneModePreferenceController.java b/Settings/src/com/android/settings/network/AirplaneModePreferenceController.java
index b3fc5177..da59bbfb 100644
--- a/Settings/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/Settings/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -33,7 +33,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.settings.AirplaneModeEnabler;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnDestroy;
diff --git a/Settings/src/com/android/settings/network/BluetoothWiFiResetPreferenceController.kt b/Settings/src/com/android/settings/network/BluetoothWiFiResetPreferenceController.kt
index 2047ed92..159f71d2 100644
--- a/Settings/src/com/android/settings/network/BluetoothWiFiResetPreferenceController.kt
+++ b/Settings/src/com/android/settings/network/BluetoothWiFiResetPreferenceController.kt
@@ -27,7 +27,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.ResetNetworkRequest
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settings.spa.preference.ComposePreferenceController
diff --git a/Settings/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java b/Settings/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
index ce225b4b..8d45792b 100644
--- a/Settings/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
@@ -22,7 +22,7 @@ import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.wifi.WifiPickerTrackerHelper;
import com.android.wifitrackerlib.WifiPickerTracker;
diff --git a/Settings/src/com/android/settings/network/ConnectedEthernetNetworkController.java b/Settings/src/com/android/settings/network/ConnectedEthernetNetworkController.java
index 2f7b4a91..d843588f 100644
--- a/Settings/src/com/android/settings/network/ConnectedEthernetNetworkController.java
+++ b/Settings/src/com/android/settings/network/ConnectedEthernetNetworkController.java
@@ -25,7 +25,7 @@ import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/network/EraseEuiccDataDialogFragment.java b/Settings/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
index 3bf9db33..391c3069 100644
--- a/Settings/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
+++ b/Settings/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
@@ -30,7 +30,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.system.ResetDashboardFragment;
import com.android.settings.wifi.dpp.WifiDppUtils;
diff --git a/Settings/src/com/android/settings/network/InternetPreferenceController.java b/Settings/src/com/android/settings/network/InternetPreferenceController.java
index 1f5042fc..6eb88324 100644
--- a/Settings/src/com/android/settings/network/InternetPreferenceController.java
+++ b/Settings/src/com/android/settings/network/InternetPreferenceController.java
@@ -39,7 +39,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SummaryUpdater;
import com.android.settings.wifi.WifiPickerTrackerHelper;
import com.android.settings.wifi.WifiSummaryUpdater;
diff --git a/Settings/src/com/android/settings/network/MobileNetworkListFragment.kt b/Settings/src/com/android/settings/network/MobileNetworkListFragment.kt
index e7228666..dc91131f 100644
--- a/Settings/src/com/android/settings/network/MobileNetworkListFragment.kt
+++ b/Settings/src/com/android/settings/network/MobileNetworkListFragment.kt
@@ -23,7 +23,7 @@ import android.provider.Settings
import android.view.View
import androidx.annotation.VisibleForTesting
import androidx.preference.Preference
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.SettingsPreferenceFragment
import com.android.settings.dashboard.DashboardFragment
import com.android.settings.flags.Flags
diff --git a/Settings/src/com/android/settings/network/MobileNetworkSummaryController.java b/Settings/src/com/android/settings/network/MobileNetworkSummaryController.java
index 15c14941..a301d531 100644
--- a/Settings/src/com/android/settings/network/MobileNetworkSummaryController.java
+++ b/Settings/src/com/android/settings/network/MobileNetworkSummaryController.java
@@ -32,7 +32,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.telephony.MobileNetworkUtils;
diff --git a/Settings/src/com/android/settings/network/NetworkDashboardFragment.java b/Settings/src/com/android/settings/network/NetworkDashboardFragment.java
index 323d9354..216e4959 100644
--- a/Settings/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/Settings/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -21,7 +21,7 @@ import android.content.Intent;
import androidx.lifecycle.LifecycleOwner;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsDumpService;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/network/NetworkProviderCallsSmsController.kt b/Settings/src/com/android/settings/network/NetworkProviderCallsSmsController.kt
index 67247c11..c127ecd7 100644
--- a/Settings/src/com/android/settings/network/NetworkProviderCallsSmsController.kt
+++ b/Settings/src/com/android/settings/network/NetworkProviderCallsSmsController.kt
@@ -26,7 +26,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.LifecycleOwner
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settings.flags.Flags
import com.android.settingslib.RestrictedPreference
diff --git a/Settings/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/Settings/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
index ffe5b052..41c3a2e0 100644
--- a/Settings/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
+++ b/Settings/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
@@ -22,7 +22,7 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.Flags;
import com.android.settings.network.telephony.CallsDefaultSubscriptionController;
diff --git a/Settings/src/com/android/settings/network/NetworkProviderSettings.java b/Settings/src/com/android/settings/network/NetworkProviderSettings.java
index 0bc426c9..3dd80b7e 100644
--- a/Settings/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/Settings/src/com/android/settings/network/NetworkProviderSettings.java
@@ -60,7 +60,7 @@ import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.AirplaneModeEnabler;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datausage.DataUsagePreference;
diff --git a/Settings/src/com/android/settings/network/NetworkProviderSimListController.java b/Settings/src/com/android/settings/network/NetworkProviderSimListController.java
index 02b19802..6ea93caa 100644
--- a/Settings/src/com/android/settings/network/NetworkProviderSimListController.java
+++ b/Settings/src/com/android/settings/network/NetworkProviderSimListController.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/Settings/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 3b997777..4730f114 100644
--- a/Settings/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/Settings/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -47,7 +47,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.CustomDialogPreferenceCompat;
diff --git a/Settings/src/com/android/settings/network/PrivateDnsPreferenceController.java b/Settings/src/com/android/settings/network/PrivateDnsPreferenceController.java
index 21e4926f..1991ace2 100644
--- a/Settings/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/Settings/src/com/android/settings/network/PrivateDnsPreferenceController.java
@@ -43,7 +43,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.util.ArrayUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
diff --git a/Settings/src/com/android/settings/network/ProviderModelSlice.java b/Settings/src/com/android/settings/network/ProviderModelSlice.java
index 86ba5639..34cabcf5 100644
--- a/Settings/src/com/android/settings/network/ProviderModelSlice.java
+++ b/Settings/src/com/android/settings/network/ProviderModelSlice.java
@@ -44,7 +44,7 @@ import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.network.telephony.MobileNetworkUtils;
diff --git a/Settings/src/com/android/settings/network/ProviderModelSliceHelper.java b/Settings/src/com/android/settings/network/ProviderModelSliceHelper.java
index 686990b8..c9c598f2 100644
--- a/Settings/src/com/android/settings/network/ProviderModelSliceHelper.java
+++ b/Settings/src/com/android/settings/network/ProviderModelSliceHelper.java
@@ -41,7 +41,7 @@ import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.slices.CustomSliceable;
diff --git a/Settings/src/com/android/settings/network/ResetNetworkOperationBuilder.java b/Settings/src/com/android/settings/network/ResetNetworkOperationBuilder.java
index ac07897a..154d89f7 100644
--- a/Settings/src/com/android/settings/network/ResetNetworkOperationBuilder.java
+++ b/Settings/src/com/android/settings/network/ResetNetworkOperationBuilder.java
@@ -34,7 +34,7 @@ import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.ResetNetworkRequest;
import com.android.settings.network.apn.ApnSettings;
diff --git a/Settings/src/com/android/settings/network/ResetNetworkRestrictionViewBuilder.java b/Settings/src/com/android/settings/network/ResetNetworkRestrictionViewBuilder.java
index 4f730fba..d60f6be6 100644
--- a/Settings/src/com/android/settings/network/ResetNetworkRestrictionViewBuilder.java
+++ b/Settings/src/com/android/settings/network/ResetNetworkRestrictionViewBuilder.java
@@ -26,7 +26,7 @@ import android.view.ViewStub;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
diff --git a/Settings/src/com/android/settings/network/SimOnboardingActivity.kt b/Settings/src/com/android/settings/network/SimOnboardingActivity.kt
index 98bb5d7a..ce706609 100644
--- a/Settings/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/Settings/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -55,7 +55,7 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.SidecarFragment
import com.android.settings.network.telephony.SubscriptionActionDialogActivity
import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity
diff --git a/Settings/src/com/android/settings/network/SubscriptionUtil.java b/Settings/src/com/android/settings/network/SubscriptionUtil.java
index 83f6c389..fda22ef5 100644
--- a/Settings/src/com/android/settings/network/SubscriptionUtil.java
+++ b/Settings/src/com/android/settings/network/SubscriptionUtil.java
@@ -44,7 +44,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.internal.telephony.MccTable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.network.helper.SelectableSubscriptions;
import com.android.settings.network.helper.SubscriptionAnnotation;
diff --git a/Settings/src/com/android/settings/network/SubscriptionsPreferenceController.java b/Settings/src/com/android/settings/network/SubscriptionsPreferenceController.java
index 09ce02ee..adce1232 100644
--- a/Settings/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/Settings/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -53,7 +53,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.telephony.DataConnectivityListener;
import com.android.settings.network.telephony.MobileNetworkUtils;
diff --git a/Settings/src/com/android/settings/network/TetherPreferenceController.kt b/Settings/src/com/android/settings/network/TetherPreferenceController.kt
index c36a2382..c97a5723 100644
--- a/Settings/src/com/android/settings/network/TetherPreferenceController.kt
+++ b/Settings/src/com/android/settings/network/TetherPreferenceController.kt
@@ -28,7 +28,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settingslib.RestrictedLockUtilsInternal
import com.android.settingslib.TetherUtil
diff --git a/Settings/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java b/Settings/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java
index a8b02aca..e765078f 100644
--- a/Settings/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java
+++ b/Settings/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java
@@ -21,7 +21,7 @@ import android.app.AlertDialog;
import android.content.DialogInterface;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* To show a dialog to indicate tethering is unsupported by carrier.
diff --git a/Settings/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java b/Settings/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
index a5c19adc..4547bb9a 100644
--- a/Settings/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
+++ b/Settings/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.network;
import android.content.Context;
import android.text.BidiFormatter;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/network/VpnPreferenceController.java b/Settings/src/com/android/settings/network/VpnPreferenceController.java
index be078094..3c1e8d1e 100644
--- a/Settings/src/com/android/settings/network/VpnPreferenceController.java
+++ b/Settings/src/com/android/settings/network/VpnPreferenceController.java
@@ -38,7 +38,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.vpn2.VpnInfoPreference;
diff --git a/Settings/src/com/android/settings/network/WepNetworkDialogActivity.kt b/Settings/src/com/android/settings/network/WepNetworkDialogActivity.kt
index fef93ef7..19d36dc3 100644
--- a/Settings/src/com/android/settings/network/WepNetworkDialogActivity.kt
+++ b/Settings/src/com/android/settings/network/WepNetworkDialogActivity.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.style.TextAlign
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.SubSettingLauncher
import com.android.settings.wifi.ConfigureWifiSettings
import com.android.settingslib.spa.SpaBaseDialogActivity
diff --git a/Settings/src/com/android/settings/network/WifiSwitchPreferenceController.java b/Settings/src/com/android/settings/network/WifiSwitchPreferenceController.java
index 8e6f4446..eaf4d6e9 100644
--- a/Settings/src/com/android/settings/network/WifiSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/network/WifiSwitchPreferenceController.java
@@ -26,7 +26,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.GenericSwitchController;
import com.android.settings.wifi.WifiEnabler;
diff --git a/Settings/src/com/android/settings/network/apn/ApnEditPageProvider.kt b/Settings/src/com/android/settings/network/apn/ApnEditPageProvider.kt
index 1abcbdb9..d6e95c7b 100644
--- a/Settings/src/com/android/settings/network/apn/ApnEditPageProvider.kt
+++ b/Settings/src/com/android/settings/network/apn/ApnEditPageProvider.kt
@@ -37,7 +37,7 @@ import androidx.compose.ui.res.stringArrayResource
import androidx.compose.ui.res.stringResource
import androidx.navigation.NavType
import androidx.navigation.navArgument
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.compose.LocalNavController
import com.android.settingslib.spa.framework.theme.SettingsDimension
diff --git a/Settings/src/com/android/settings/network/apn/ApnEditor.java b/Settings/src/com/android/settings/network/apn/ApnEditor.java
index d1b2f2fa..f1130d3a 100644
--- a/Settings/src/com/android/settings/network/apn/ApnEditor.java
+++ b/Settings/src/com/android/settings/network/apn/ApnEditor.java
@@ -51,7 +51,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.TwoStatePreference;
import com.android.internal.util.ArrayUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.network.ProxySubscriptionManager;
diff --git a/Settings/src/com/android/settings/network/apn/ApnNetworkTypeCheckBox.kt b/Settings/src/com/android/settings/network/apn/ApnNetworkTypeCheckBox.kt
index bc85f558..a1ae628b 100644
--- a/Settings/src/com/android/settings/network/apn/ApnNetworkTypeCheckBox.kt
+++ b/Settings/src/com/android/settings/network/apn/ApnNetworkTypeCheckBox.kt
@@ -19,7 +19,7 @@ package com.android.settings.network.apn
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.editor.SettingsDropdownCheckBox
@Composable
diff --git a/Settings/src/com/android/settings/network/apn/ApnPreference.java b/Settings/src/com/android/settings/network/apn/ApnPreference.java
index dcc50cd1..7d868848 100644
--- a/Settings/src/com/android/settings/network/apn/ApnPreference.java
+++ b/Settings/src/com/android/settings/network/apn/ApnPreference.java
@@ -35,7 +35,7 @@ import android.widget.Toast;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.spa.SpaActivity;
diff --git a/Settings/src/com/android/settings/network/apn/ApnRepository.kt b/Settings/src/com/android/settings/network/apn/ApnRepository.kt
index 2d41976b..8da48085 100644
--- a/Settings/src/com/android/settings/network/apn/ApnRepository.kt
+++ b/Settings/src/com/android/settings/network/apn/ApnRepository.kt
@@ -24,7 +24,7 @@ import android.provider.Telephony
import android.telephony.SubscriptionManager
import android.telephony.TelephonyManager
import android.util.Log
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.utils.ThreadUtils
import java.util.Locale
diff --git a/Settings/src/com/android/settings/network/apn/ApnSettings.java b/Settings/src/com/android/settings/network/apn/ApnSettings.java
index c3feae82..bd2433b0 100644
--- a/Settings/src/com/android/settings/network/apn/ApnSettings.java
+++ b/Settings/src/com/android/settings/network/apn/ApnSettings.java
@@ -57,7 +57,7 @@ import android.widget.Toast;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.flags.Flags;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/network/apn/ApnStatus.kt b/Settings/src/com/android/settings/network/apn/ApnStatus.kt
index ab16f1ca..8925ced6 100644
--- a/Settings/src/com/android/settings/network/apn/ApnStatus.kt
+++ b/Settings/src/com/android/settings/network/apn/ApnStatus.kt
@@ -23,7 +23,7 @@ import android.os.Bundle
import android.provider.Telephony
import android.telephony.CarrierConfigManager
import android.util.Log
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.apn.ApnTypes.getPreSelectedApnType
private const val TAG = "ApnStatus"
diff --git a/Settings/src/com/android/settings/network/apn/ApnTypeCheckBox.kt b/Settings/src/com/android/settings/network/apn/ApnTypeCheckBox.kt
index 4d0659c6..076dba63 100644
--- a/Settings/src/com/android/settings/network/apn/ApnTypeCheckBox.kt
+++ b/Settings/src/com/android/settings/network/apn/ApnTypeCheckBox.kt
@@ -22,7 +22,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.apn.ApnTypes.toApnType
import com.android.settingslib.spa.widget.editor.SettingsDropdownCheckBox
diff --git a/Settings/src/com/android/settings/network/apn/ApnTypes.kt b/Settings/src/com/android/settings/network/apn/ApnTypes.kt
index 2c8fa2a5..74317dfb 100644
--- a/Settings/src/com/android/settings/network/apn/ApnTypes.kt
+++ b/Settings/src/com/android/settings/network/apn/ApnTypes.kt
@@ -23,7 +23,7 @@ import android.widget.Toast
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.text.intl.Locale
import androidx.compose.ui.text.toLowerCase
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.editor.SettingsDropdownCheckOption
object ApnTypes {
diff --git a/Settings/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java b/Settings/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java
index ef74a2eb..752da819 100644
--- a/Settings/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java
@@ -40,7 +40,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.flags.Flags;
import com.android.settings.network.MobileDataContentObserver;
diff --git a/Settings/src/com/android/settings/network/telephony/ConfirmDialogFragment.java b/Settings/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
index a807518e..b1dfdb5d 100644
--- a/Settings/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
+++ b/Settings/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
@@ -34,7 +34,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/Settings/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java b/Settings/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java
index 3bed75ff..2781fedc 100644
--- a/Settings/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java
+++ b/Settings/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java
@@ -27,7 +27,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java b/Settings/src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java
index 08e993b6..f0ab461b 100644
--- a/Settings/src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java
@@ -43,7 +43,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.telephony.util.TelephonyUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.MobileNetworkRepository;
import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt b/Settings/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
index 240843db..f9ae8884 100644
--- a/Settings/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
+++ b/Settings/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
@@ -28,7 +28,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.datausage.DataUsageUtils
import com.android.settings.datausage.lib.DataUsageLib
import com.android.settings.datausage.lib.NetworkCycleDataRepository
diff --git a/Settings/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/Settings/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
index 03ce7f66..1e704d32 100644
--- a/Settings/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
+++ b/Settings/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
@@ -31,7 +31,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.network.DefaultSubscriptionReceiver;
import com.android.settings.network.MobileNetworkRepository;
diff --git a/Settings/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java b/Settings/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
index 8247f63c..53900f29 100644
--- a/Settings/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
+++ b/Settings/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
@@ -23,7 +23,7 @@ import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SidecarFragment;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.kt b/Settings/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.kt
index b7ee41dd..0e2b6245 100644
--- a/Settings/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.kt
+++ b/Settings/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.kt
@@ -23,7 +23,7 @@ import android.telephony.TelephonyManager
import androidx.lifecycle.LifecycleOwner
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settings.network.SubscriptionUtil
import com.android.settings.wifi.dpp.WifiDppUtils
diff --git a/Settings/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/Settings/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
index e941ce54..5ac4b82a 100644
--- a/Settings/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.network.CarrierConfigCache;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/Settings/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 56ce9e7a..761d6e26 100644
--- a/Settings/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -43,7 +43,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.AllowedNetworkTypesListener;
import com.android.settings.network.CarrierConfigCache;
import com.android.settings.network.SubscriptionsChangeListener;
diff --git a/Settings/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/Settings/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index 1a71e5aa..947c7222 100644
--- a/Settings/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -35,7 +35,7 @@ import androidx.preference.TwoStatePreference;
import com.android.internal.telephony.flags.Flags;
import com.android.internal.telephony.util.ArrayUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.ims.VolteQueryImsState;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java b/Settings/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
index 158beccc..3d45134f 100644
--- a/Settings/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
+++ b/Settings/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
@@ -37,7 +37,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.ims.VolteQueryImsState;
import com.android.settings.slices.CustomSliceRegistry;
diff --git a/Settings/src/com/android/settings/network/telephony/EuiccRacConnectivityDialogActivity.java b/Settings/src/com/android/settings/network/telephony/EuiccRacConnectivityDialogActivity.java
index cb4ab18d..21d59bbc 100644
--- a/Settings/src/com/android/settings/network/telephony/EuiccRacConnectivityDialogActivity.java
+++ b/Settings/src/com/android/settings/network/telephony/EuiccRacConnectivityDialogActivity.java
@@ -24,7 +24,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** This dialog activity advise the user to have connectivity if the eSIM uses a RAC. */
public class EuiccRacConnectivityDialogActivity extends SubscriptionActionDialogActivity
diff --git a/Settings/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/Settings/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
index aa772ada..6044243e 100644
--- a/Settings/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
+++ b/Settings/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
@@ -26,7 +26,7 @@ import android.telephony.SubscriptionManager;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.wifi.WifiPickerTrackerHelper;
diff --git a/Settings/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/Settings/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index bec7ee74..f89e669f 100644
--- a/Settings/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.network.MobileNetworkRepository;
import com.android.settings.wifi.WifiPickerTrackerHelper;
diff --git a/Settings/src/com/android/settings/network/telephony/MobileDataSlice.java b/Settings/src/com/android/settings/network/telephony/MobileDataSlice.java
index d25ae65d..23008de4 100644
--- a/Settings/src/com/android/settings/network/telephony/MobileDataSlice.java
+++ b/Settings/src/com/android/settings/network/telephony/MobileDataSlice.java
@@ -39,7 +39,7 @@ import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.MobileDataContentObserver;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt b/Settings/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt
index 907bab12..abca8582 100644
--- a/Settings/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt
+++ b/Settings/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt
@@ -34,7 +34,7 @@ import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.deviceinfo.PhoneNumberUtil
import com.android.settings.flags.Flags
import com.android.settings.network.SubscriptionInfoListViewModel
diff --git a/Settings/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt b/Settings/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt
index 8ec313b0..626c8a0c 100644
--- a/Settings/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt
+++ b/Settings/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt
@@ -29,7 +29,7 @@ import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.deviceinfo.imei.ImeiInfoDialogFragment
import com.android.settings.flags.Flags
import com.android.settings.network.SubscriptionInfoListViewModel
diff --git a/Settings/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt b/Settings/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt
index 65a4b7e6..d9d9fbf6 100644
--- a/Settings/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt
+++ b/Settings/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt
@@ -26,7 +26,7 @@ import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.flags.Flags
import com.android.settings.network.SubscriptionInfoListViewModel
import com.android.settings.network.SubscriptionUtil
diff --git a/Settings/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/Settings/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 2f2b20e1..50cd6e41 100644
--- a/Settings/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/Settings/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -40,7 +40,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings.MobileNetworkActivity;
import com.android.settings.SettingsActivity;
import com.android.settings.datausage.BillingCyclePreferenceController;
diff --git a/Settings/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/Settings/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 8a635051..76528d7d 100644
--- a/Settings/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/Settings/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -72,7 +72,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/network/telephony/NetworkOperatorPreference.kt b/Settings/src/com/android/settings/network/telephony/NetworkOperatorPreference.kt
index c696ef13..b34f89ed 100644
--- a/Settings/src/com/android/settings/network/telephony/NetworkOperatorPreference.kt
+++ b/Settings/src/com/android/settings/network/telephony/NetworkOperatorPreference.kt
@@ -31,7 +31,7 @@ import android.util.Log
import androidx.annotation.OpenForTesting
import androidx.preference.Preference
import com.android.internal.telephony.OperatorInfo
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.telephony.CellInfoUtil.getNetworkTitle
import com.android.settings.network.telephony.CellInfoUtil.getOperatorNumeric
import java.util.Objects
diff --git a/Settings/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java b/Settings/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
index c5879eef..286b2172 100644
--- a/Settings/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
+++ b/Settings/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
@@ -40,7 +40,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.SubscriptionsChangeListener;
import com.android.settings.network.ims.WifiCallingQueryImsState;
diff --git a/Settings/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java b/Settings/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java
index 7a0ac148..7eac7f88 100644
--- a/Settings/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java
@@ -23,7 +23,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/network/telephony/NetworkScanHelper.java b/Settings/src/com/android/settings/network/telephony/NetworkScanHelper.java
index 19613291..bf309503 100644
--- a/Settings/src/com/android/settings/network/telephony/NetworkScanHelper.java
+++ b/Settings/src/com/android/settings/network/telephony/NetworkScanHelper.java
@@ -32,7 +32,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.telephony.CellNetworkScanResult;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
diff --git a/Settings/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/Settings/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 461930b9..24e846b4 100644
--- a/Settings/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/Settings/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -46,7 +46,7 @@ import androidx.preference.PreferenceCategory;
import com.android.internal.annotations.Initializer;
import com.android.internal.telephony.OperatorInfo;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java b/Settings/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
index fd5df6fb..b60f910f 100644
--- a/Settings/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
@@ -23,7 +23,7 @@ import android.telephony.TelephonyManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.HelpUtils;
diff --git a/Settings/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/Settings/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index bdfeace1..02031f89 100644
--- a/Settings/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -26,7 +26,7 @@ import android.util.Log;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.CarrierConfigCache;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
diff --git a/Settings/src/com/android/settings/network/telephony/ProgressDialogFragment.java b/Settings/src/com/android/settings/network/telephony/ProgressDialogFragment.java
index 29f269b8..ed9ffa85 100644
--- a/Settings/src/com/android/settings/network/telephony/ProgressDialogFragment.java
+++ b/Settings/src/com/android/settings/network/telephony/ProgressDialogFragment.java
@@ -26,7 +26,7 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.view.KeyEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Fragment to show a progress dialog. */
public class ProgressDialogFragment extends DialogFragment {
diff --git a/Settings/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/Settings/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
index ebc55751..4dc937cd 100644
--- a/Settings/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
+++ b/Settings/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -44,7 +44,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.flags.Flags;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/Settings/src/com/android/settings/network/telephony/RoamingDialogFragment.java
index 5b579921..17d94ded 100644
--- a/Settings/src/com/android/settings/network/telephony/RoamingDialogFragment.java
+++ b/Settings/src/com/android/settings/network/telephony/RoamingDialogFragment.java
@@ -26,7 +26,7 @@ import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.TelephonyManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/network/telephony/SatelliteSetting.java b/Settings/src/com/android/settings/network/telephony/SatelliteSetting.java
index b6d018ab..d332c456 100644
--- a/Settings/src/com/android/settings/network/telephony/SatelliteSetting.java
+++ b/Settings/src/com/android/settings/network/telephony/SatelliteSetting.java
@@ -39,7 +39,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.Utils;
diff --git a/Settings/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/Settings/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
index 5e8a3c3d..78552e58 100644
--- a/Settings/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
+++ b/Settings/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.network.CarrierConfigCache;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/Settings/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index 6f4d3c3e..e1f14598 100644
--- a/Settings/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/Settings/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -29,7 +29,7 @@ import android.util.Log;
import android.view.View;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SidecarFragment;
import com.android.settings.network.EnableMultiSimSidecar;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/network/telephony/WarningDialogFragment.java b/Settings/src/com/android/settings/network/telephony/WarningDialogFragment.java
index 58bc1daf..34b3a5b0 100644
--- a/Settings/src/com/android/settings/network/telephony/WarningDialogFragment.java
+++ b/Settings/src/com/android/settings/network/telephony/WarningDialogFragment.java
@@ -30,7 +30,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Fragment to show a warning dialog. The caller should implement onConfirmListener. */
public class WarningDialogFragment extends BaseDialogFragment
diff --git a/Settings/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt b/Settings/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt
index b0ea6a67..523639cc 100644
--- a/Settings/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt
+++ b/Settings/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt
@@ -28,7 +28,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.telephony.wificalling.WifiCallingRepository
import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
import kotlinx.coroutines.Dispatchers
diff --git a/Settings/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt b/Settings/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt
index d7095749..d438c5ba 100644
--- a/Settings/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt
+++ b/Settings/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt
@@ -34,7 +34,7 @@ import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Settings.NetworkSelectActivity
import com.android.settings.network.CarrierConfigCache
import com.android.settings.network.telephony.MobileNetworkUtils
diff --git a/Settings/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.kt b/Settings/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.kt
index 84cdec44..29e06a52 100644
--- a/Settings/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.kt
+++ b/Settings/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.kt
@@ -24,7 +24,7 @@ import android.telephony.TelephonyManager
import androidx.lifecycle.LifecycleOwner
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Settings.NetworkSelectActivity
import com.android.settings.network.telephony.MobileNetworkUtils
import com.android.settings.network.telephony.TelephonyBasePreferenceController
diff --git a/Settings/src/com/android/settings/network/tether/TetherSettings.java b/Settings/src/com/android/settings/network/tether/TetherSettings.java
index 77ef4b6e..98e5abf4 100644
--- a/Settings/src/com/android/settings/network/tether/TetherSettings.java
+++ b/Settings/src/com/android/settings/network/tether/TetherSettings.java
@@ -53,7 +53,7 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.Utils;
import com.android.settings.datausage.DataSaverBackend;
diff --git a/Settings/src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java b/Settings/src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java
index 305bbc10..7c2884ac 100644
--- a/Settings/src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java
+++ b/Settings/src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java
@@ -26,7 +26,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.nfc.AppStateNfcTagAppsBridge.NfcTagAppState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
diff --git a/Settings/src/com/android/settings/nfc/DefaultPaymentSettings.java b/Settings/src/com/android/settings/nfc/DefaultPaymentSettings.java
index ddac08be..0cd40c6c 100644
--- a/Settings/src/com/android/settings/nfc/DefaultPaymentSettings.java
+++ b/Settings/src/com/android/settings/nfc/DefaultPaymentSettings.java
@@ -34,7 +34,7 @@ import android.text.style.RelativeSizeSpan;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/src/com/android/settings/nfc/HowItWorks.java b/Settings/src/com/android/settings/nfc/HowItWorks.java
index 310a7e10..3d528b24 100644
--- a/Settings/src/com/android/settings/nfc/HowItWorks.java
+++ b/Settings/src/com/android/settings/nfc/HowItWorks.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
import android.view.View;
import android.widget.Button;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class HowItWorks extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/Settings/src/com/android/settings/nfc/NfcDetectionPointController.java b/Settings/src/com/android/settings/nfc/NfcDetectionPointController.java
index b2e8f6ab..ae148739 100644
--- a/Settings/src/com/android/settings/nfc/NfcDetectionPointController.java
+++ b/Settings/src/com/android/settings/nfc/NfcDetectionPointController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
* Controller that used to show nfc detection point guidance
diff --git a/Settings/src/com/android/settings/nfc/NfcForegroundPreferenceController.java b/Settings/src/com/android/settings/nfc/NfcForegroundPreferenceController.java
index b036da24..58915db5 100644
--- a/Settings/src/com/android/settings/nfc/NfcForegroundPreferenceController.java
+++ b/Settings/src/com/android/settings/nfc/NfcForegroundPreferenceController.java
@@ -21,7 +21,7 @@ import android.permission.flags.Flags;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/nfc/NfcPaymentPreferenceController.java b/Settings/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
index edb12dd9..4f2c2bf9 100644
--- a/Settings/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
+++ b/Settings/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
@@ -35,7 +35,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/nfc/NfcPreferenceController.java b/Settings/src/com/android/settings/nfc/NfcPreferenceController.java
index 4d750042..672c6856 100644
--- a/Settings/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/Settings/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -27,7 +27,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/nfc/PaymentDefaultDialog.java b/Settings/src/com/android/settings/nfc/PaymentDefaultDialog.java
index d333b3da..d9ebfcad 100644
--- a/Settings/src/com/android/settings/nfc/PaymentDefaultDialog.java
+++ b/Settings/src/com/android/settings/nfc/PaymentDefaultDialog.java
@@ -26,7 +26,7 @@ import android.util.Log;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
import com.android.settings.nfc.PaymentBackend.PaymentInfo;
diff --git a/Settings/src/com/android/settings/nfc/PaymentSettings.java b/Settings/src/com/android/settings/nfc/PaymentSettings.java
index a1f75bc6..ad24c3f2 100644
--- a/Settings/src/com/android/settings/nfc/PaymentSettings.java
+++ b/Settings/src/com/android/settings/nfc/PaymentSettings.java
@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/nfc/SecureNfcEnabler.java b/Settings/src/com/android/settings/nfc/SecureNfcEnabler.java
index b02c9026..2dfe7a8c 100644
--- a/Settings/src/com/android/settings/nfc/SecureNfcEnabler.java
+++ b/Settings/src/com/android/settings/nfc/SecureNfcEnabler.java
@@ -22,7 +22,7 @@ import android.os.UserManager;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* SecureNfcEnabler is a helper to manage the Secure Nfc on/off checkbox preference
diff --git a/Settings/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/Settings/src/com/android/settings/nfc/SecureNfcPreferenceController.java
index 03eed688..098278b1 100644
--- a/Settings/src/com/android/settings/nfc/SecureNfcPreferenceController.java
+++ b/Settings/src/com/android/settings/nfc/SecureNfcPreferenceController.java
@@ -22,7 +22,7 @@ import android.os.UserManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
diff --git a/Settings/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/Settings/src/com/android/settings/notification/AlarmVolumePreferenceController.java
index 15657f14..758031b1 100644
--- a/Settings/src/com/android/settings/notification/AlarmVolumePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/AlarmVolumePreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.media.AudioManager;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class AlarmVolumePreferenceController extends VolumeSeekBarPreferenceController {
diff --git a/Settings/src/com/android/settings/notification/AppBubbleListPreferenceController.java b/Settings/src/com/android/settings/notification/AppBubbleListPreferenceController.java
index 377cb463..e92ec31b 100644
--- a/Settings/src/com/android/settings/notification/AppBubbleListPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/AppBubbleListPreferenceController.java
@@ -34,7 +34,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.app.AppConversationListPreferenceController;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/Settings/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index 69d95a81..ead5ea38 100644
--- a/Settings/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/notification/BootSoundPreferenceController.java b/Settings/src/com/android/settings/notification/BootSoundPreferenceController.java
index 05bc259b..9580439c 100644
--- a/Settings/src/com/android/settings/notification/BootSoundPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/BootSoundPreferenceController.java
@@ -64,7 +64,7 @@ public class BootSoundPreferenceController extends AbstractPreferenceController
@Override
public boolean isAvailable() {
- return mContext.getResources().getBoolean(com.android.settings.R.bool.has_boot_sounds);
+ return mContext.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_boot_sounds);
}
}
\ No newline at end of file
diff --git a/Settings/src/com/android/settings/notification/BubbleNotificationSettings.java b/Settings/src/com/android/settings/notification/BubbleNotificationSettings.java
index 6e04683c..8c11e7a1 100644
--- a/Settings/src/com/android/settings/notification/BubbleNotificationSettings.java
+++ b/Settings/src/com/android/settings/notification/BubbleNotificationSettings.java
@@ -18,7 +18,7 @@ package com.android.settings.notification;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java b/Settings/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
index 541e9200..9cb144fc 100644
--- a/Settings/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
@@ -21,7 +21,7 @@ import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/notification/CallVolumePreferenceController.java b/Settings/src/com/android/settings/notification/CallVolumePreferenceController.java
index d5052270..e9f5ab8f 100644
--- a/Settings/src/com/android/settings/notification/CallVolumePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/CallVolumePreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.media.AudioManager;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class CallVolumePreferenceController extends VolumeSeekBarPreferenceController {
diff --git a/Settings/src/com/android/settings/notification/ChargingSoundPreferenceController.java b/Settings/src/com/android/settings/notification/ChargingSoundPreferenceController.java
index c7cd232a..a7361be3 100644
--- a/Settings/src/com/android/settings/notification/ChargingSoundPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/ChargingSoundPreferenceController.java
@@ -21,7 +21,7 @@ import static com.android.settings.notification.SettingPref.TYPE_SECURE;
import android.content.Context;
import android.provider.Settings.Secure;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/ConfigureNotificationSettings.java b/Settings/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 19222612..67c705c6 100644
--- a/Settings/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/Settings/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -33,7 +33,7 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RingtonePreference;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/notification/ConversationListSummaryPreferenceController.java b/Settings/src/com/android/settings/notification/ConversationListSummaryPreferenceController.java
index 176d7489..adffe2b4 100644
--- a/Settings/src/com/android/settings/notification/ConversationListSummaryPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/ConversationListSummaryPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.notification;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/notification/DockAudioMediaPreferenceController.java b/Settings/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
index 71704341..e6f6f93c 100644
--- a/Settings/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
@@ -44,7 +44,7 @@ public class DockAudioMediaPreferenceController extends SettingPrefController {
@Override
public boolean isApplicable(Context context) {
return isLeDesk() && context.getResources().getBoolean(
- com.android.settings.R.bool.has_dock_settings);
+ com.cariad.cea.settings.R.bool.has_dock_settings);
}
@Override
@@ -52,10 +52,10 @@ public class DockAudioMediaPreferenceController extends SettingPrefController {
switch(value) {
case DOCK_AUDIO_MEDIA_DISABLED:
return res.getString(
- com.android.settings.R.string.dock_audio_media_disabled);
+ com.cariad.cea.settings.R.string.dock_audio_media_disabled);
case DOCK_AUDIO_MEDIA_ENABLED:
return res.getString(
- com.android.settings.R.string.dock_audio_media_enabled);
+ com.cariad.cea.settings.R.string.dock_audio_media_enabled);
default:
throw new IllegalArgumentException();
}
diff --git a/Settings/src/com/android/settings/notification/DockingSoundPreferenceController.java b/Settings/src/com/android/settings/notification/DockingSoundPreferenceController.java
index f3a281ec..bcd29eac 100644
--- a/Settings/src/com/android/settings/notification/DockingSoundPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/DockingSoundPreferenceController.java
@@ -21,7 +21,7 @@ import static com.android.settings.notification.SettingPref.TYPE_GLOBAL;
import android.content.Context;
import android.provider.Settings.Global;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/EmergencyTonePreferenceController.java b/Settings/src/com/android/settings/notification/EmergencyTonePreferenceController.java
index 9c2a9584..1e20773c 100644
--- a/Settings/src/com/android/settings/notification/EmergencyTonePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/EmergencyTonePreferenceController.java
@@ -23,7 +23,7 @@ import android.content.res.Resources;
import android.provider.Settings.Global;
import android.telephony.TelephonyManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/ImportanceResetPreferenceController.java b/Settings/src/com/android/settings/notification/ImportanceResetPreferenceController.java
index 2d03f238..797f9dd3 100644
--- a/Settings/src/com/android/settings/notification/ImportanceResetPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/ImportanceResetPreferenceController.java
@@ -22,7 +22,7 @@ import android.widget.Toast;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class ImportanceResetPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/Settings/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index f1857de3..0f99e641 100644
--- a/Settings/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -37,7 +37,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
diff --git a/Settings/src/com/android/settings/notification/MediaVolumePreferenceController.java b/Settings/src/com/android/settings/notification/MediaVolumePreferenceController.java
index e70cf95e..08bad6a3 100644
--- a/Settings/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -30,7 +30,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.bluetooth.BluetoothBroadcastDialog;
import com.android.settings.media.MediaOutputIndicatorWorker;
diff --git a/Settings/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/Settings/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index 3f300c0f..835825dc 100644
--- a/Settings/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/Settings/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
@@ -47,7 +47,7 @@ import androidx.annotation.Nullable;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** @hide */
public class NotificationAccessConfirmationActivity extends Activity
diff --git a/Settings/src/com/android/settings/notification/NotificationAccessSettings.java b/Settings/src/com/android/settings/notification/NotificationAccessSettings.java
index 6f16e56a..8e01c473 100644
--- a/Settings/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/Settings/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -44,7 +44,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails;
diff --git a/Settings/src/com/android/settings/notification/NotificationAssistantDialogFragment.java b/Settings/src/com/android/settings/notification/NotificationAssistantDialogFragment.java
index 4c13ef2f..0d2376de 100644
--- a/Settings/src/com/android/settings/notification/NotificationAssistantDialogFragment.java
+++ b/Settings/src/com/android/settings/notification/NotificationAssistantDialogFragment.java
@@ -25,7 +25,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class NotificationAssistantDialogFragment extends InstrumentedDialogFragment
diff --git a/Settings/src/com/android/settings/notification/NotificationAssistantPicker.java b/Settings/src/com/android/settings/notification/NotificationAssistantPicker.java
index fcee56a7..74ec1cf9 100644
--- a/Settings/src/com/android/settings/notification/NotificationAssistantPicker.java
+++ b/Settings/src/com/android/settings/notification/NotificationAssistantPicker.java
@@ -28,7 +28,7 @@ import android.service.notification.NotificationAssistantService;
import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.applications.DefaultAppInfo;
diff --git a/Settings/src/com/android/settings/notification/NotificationAssistantPreferenceController.java b/Settings/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
index 6f246b73..2a089927 100644
--- a/Settings/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
@@ -24,7 +24,7 @@ import android.provider.Settings;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.google.common.annotations.VisibleForTesting;
diff --git a/Settings/src/com/android/settings/notification/NotificationBackend.java b/Settings/src/com/android/settings/notification/NotificationBackend.java
index 8e6019c3..9816c8de 100644
--- a/Settings/src/com/android/settings/notification/NotificationBackend.java
+++ b/Settings/src/com/android/settings/notification/NotificationBackend.java
@@ -53,7 +53,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.util.CollectionUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.notification.ConversationIconFactory;
diff --git a/Settings/src/com/android/settings/notification/NotificationRingtonePreferenceController.java b/Settings/src/com/android/settings/notification/NotificationRingtonePreferenceController.java
index 00f478f2..a096dc8e 100644
--- a/Settings/src/com/android/settings/notification/NotificationRingtonePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/NotificationRingtonePreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.notification;
import android.content.Context;
import android.media.RingtoneManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class NotificationRingtonePreferenceController extends RingtonePreferenceControllerBase {
diff --git a/Settings/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/Settings/src/com/android/settings/notification/NotificationVolumePreferenceController.java
index fe7b70bf..f6dbdf03 100644
--- a/Settings/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -31,7 +31,7 @@ import android.view.View;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
/**
diff --git a/Settings/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java b/Settings/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java
index dfdd6497..69739f8e 100644
--- a/Settings/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java
+++ b/Settings/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java
@@ -24,7 +24,7 @@ import android.os.Vibrator;
import android.provider.Settings;
import com.android.server.notification.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java b/Settings/src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java
index 99d0a698..7112c669 100644
--- a/Settings/src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java
+++ b/Settings/src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java
@@ -27,7 +27,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import com.android.server.notification.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/notification/PoliteNotificationFilterController.java b/Settings/src/com/android/settings/notification/PoliteNotificationFilterController.java
index 8093f55a..6503ee63 100644
--- a/Settings/src/com/android/settings/notification/PoliteNotificationFilterController.java
+++ b/Settings/src/com/android/settings/notification/PoliteNotificationFilterController.java
@@ -27,7 +27,7 @@ import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.server.notification.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
diff --git a/Settings/src/com/android/settings/notification/PoliteNotificationsPreferenceFragment.java b/Settings/src/com/android/settings/notification/PoliteNotificationsPreferenceFragment.java
index 449e678c..06bdf04e 100644
--- a/Settings/src/com/android/settings/notification/PoliteNotificationsPreferenceFragment.java
+++ b/Settings/src/com/android/settings/notification/PoliteNotificationsPreferenceFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.notification;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/Settings/src/com/android/settings/notification/PulseNotificationPreferenceController.java
index ad53fc3a..e4df43e4 100644
--- a/Settings/src/com/android/settings/notification/PulseNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/PulseNotificationPreferenceController.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
diff --git a/Settings/src/com/android/settings/notification/RedactNotificationPreferenceController.java b/Settings/src/com/android/settings/notification/RedactNotificationPreferenceController.java
index 4ebf08e0..79fd6a37 100644
--- a/Settings/src/com/android/settings/notification/RedactNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/RedactNotificationPreferenceController.java
@@ -33,7 +33,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/src/com/android/settings/notification/RedactionInterstitial.java b/Settings/src/com/android/settings/notification/RedactionInterstitial.java
index 83d5a016..c7731a91 100644
--- a/Settings/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/Settings/src/com/android/settings/notification/RedactionInterstitial.java
@@ -39,7 +39,7 @@ import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedRadioButton;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
diff --git a/Settings/src/com/android/settings/notification/RedactionSettingsStandalone.java b/Settings/src/com/android/settings/notification/RedactionSettingsStandalone.java
index 8195094d..fc5fbe0b 100644
--- a/Settings/src/com/android/settings/notification/RedactionSettingsStandalone.java
+++ b/Settings/src/com/android/settings/notification/RedactionSettingsStandalone.java
@@ -18,7 +18,7 @@ package com.android.settings.notification;
import android.content.Intent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.notification.RedactionInterstitial.RedactionInterstitialFragment;
diff --git a/Settings/src/com/android/settings/notification/RemoteVolumeGroupController.java b/Settings/src/com/android/settings/notification/RemoteVolumeGroupController.java
index 919b6d01..734e43aa 100644
--- a/Settings/src/com/android/settings/notification/RemoteVolumeGroupController.java
+++ b/Settings/src/com/android/settings/notification/RemoteVolumeGroupController.java
@@ -29,7 +29,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/notification/RingVolumePreferenceController.java b/Settings/src/com/android/settings/notification/RingVolumePreferenceController.java
index 09d8ecc1..2585eec8 100644
--- a/Settings/src/com/android/settings/notification/RingVolumePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/RingVolumePreferenceController.java
@@ -29,7 +29,7 @@ import android.service.notification.NotificationListenerService;
import androidx.lifecycle.OnLifecycleEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
/**
diff --git a/Settings/src/com/android/settings/notification/RingerModeAffectedVolumePreferenceController.java b/Settings/src/com/android/settings/notification/RingerModeAffectedVolumePreferenceController.java
index ab65f8f5..25b8ee42 100644
--- a/Settings/src/com/android/settings/notification/RingerModeAffectedVolumePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/RingerModeAffectedVolumePreferenceController.java
@@ -26,7 +26,7 @@ import android.os.Vibrator;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Objects;
diff --git a/Settings/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java b/Settings/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
index 896d99e1..3d013a3c 100644
--- a/Settings/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
@@ -21,7 +21,7 @@ import static com.android.settings.notification.SettingPref.TYPE_SYSTEM;
import android.content.Context;
import android.provider.Settings.System;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/SeparateRingVolumePreferenceController.java b/Settings/src/com/android/settings/notification/SeparateRingVolumePreferenceController.java
index 91926e3c..8f5af6f7 100644
--- a/Settings/src/com/android/settings/notification/SeparateRingVolumePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/SeparateRingVolumePreferenceController.java
@@ -29,7 +29,7 @@ import android.service.notification.NotificationListenerService;
import androidx.lifecycle.OnLifecycleEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
/**
diff --git a/Settings/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java b/Settings/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
index 1addd822..6cdb033b 100644
--- a/Settings/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
@@ -26,7 +26,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java b/Settings/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
index a37e29d2..1fa916bc 100644
--- a/Settings/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
@@ -23,7 +23,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController
diff --git a/Settings/src/com/android/settings/notification/SilentStatusBarPreferenceController.java b/Settings/src/com/android/settings/notification/SilentStatusBarPreferenceController.java
index d8c856e6..ae182293 100644
--- a/Settings/src/com/android/settings/notification/SilentStatusBarPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/SilentStatusBarPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.notification;
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.google.common.annotations.VisibleForTesting;
diff --git a/Settings/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java b/Settings/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java
index 2c89f743..390cb4ba 100644
--- a/Settings/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java
@@ -23,7 +23,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class SnoozeNotificationPreferenceController extends TogglePreferenceController {
diff --git a/Settings/src/com/android/settings/notification/SoundSettings.java b/Settings/src/com/android/settings/notification/SoundSettings.java
index 4575708b..4dd2e9c0 100644
--- a/Settings/src/com/android/settings/notification/SoundSettings.java
+++ b/Settings/src/com/android/settings/notification/SoundSettings.java
@@ -33,7 +33,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RingtonePreference;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/notification/SoundWorkSettings.java b/Settings/src/com/android/settings/notification/SoundWorkSettings.java
index 2cb42154..6e61e3ba 100644
--- a/Settings/src/com/android/settings/notification/SoundWorkSettings.java
+++ b/Settings/src/com/android/settings/notification/SoundWorkSettings.java
@@ -33,7 +33,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RingtonePreference;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/notification/SoundWorkSettingsController.java b/Settings/src/com/android/settings/notification/SoundWorkSettingsController.java
index 10a3483a..9a58fb25 100644
--- a/Settings/src/com/android/settings/notification/SoundWorkSettingsController.java
+++ b/Settings/src/com/android/settings/notification/SoundWorkSettingsController.java
@@ -46,7 +46,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.settings.DefaultRingtonePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/SpatialAudioParentPreferenceController.java b/Settings/src/com/android/settings/notification/SpatialAudioParentPreferenceController.java
index 8ae0493a..91a80f81 100644
--- a/Settings/src/com/android/settings/notification/SpatialAudioParentPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/SpatialAudioParentPreferenceController.java
@@ -21,7 +21,7 @@ import android.media.AudioManager;
import android.media.Spatializer;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/notification/SpatialAudioPreferenceController.java b/Settings/src/com/android/settings/notification/SpatialAudioPreferenceController.java
index 707340f0..5b50d403 100644
--- a/Settings/src/com/android/settings/notification/SpatialAudioPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/SpatialAudioPreferenceController.java
@@ -24,7 +24,7 @@ import android.media.Spatializer;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/notification/SpatialAudioSettings.java b/Settings/src/com/android/settings/notification/SpatialAudioSettings.java
index 3bdb5241..73abbed2 100644
--- a/Settings/src/com/android/settings/notification/SpatialAudioSettings.java
+++ b/Settings/src/com/android/settings/notification/SpatialAudioSettings.java
@@ -21,7 +21,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/notification/SpatialAudioWiredHeadphonesController.java b/Settings/src/com/android/settings/notification/SpatialAudioWiredHeadphonesController.java
index 9ff6a7f6..c181ea25 100644
--- a/Settings/src/com/android/settings/notification/SpatialAudioWiredHeadphonesController.java
+++ b/Settings/src/com/android/settings/notification/SpatialAudioWiredHeadphonesController.java
@@ -24,7 +24,7 @@ import android.media.Spatializer;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/notification/SwipeDirectionPreferenceController.java b/Settings/src/com/android/settings/notification/SwipeDirectionPreferenceController.java
index 0d122d78..3c3a974c 100644
--- a/Settings/src/com/android/settings/notification/SwipeDirectionPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/SwipeDirectionPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.notification;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.ListPreference;
diff --git a/Settings/src/com/android/settings/notification/TouchSoundPreferenceController.java b/Settings/src/com/android/settings/notification/TouchSoundPreferenceController.java
index 608cf677..d0236af6 100644
--- a/Settings/src/com/android/settings/notification/TouchSoundPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/TouchSoundPreferenceController.java
@@ -23,7 +23,7 @@ import android.media.AudioManager;
import android.os.AsyncTask;
import android.provider.Settings.System;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/VolumeSeekBarPreference.java b/Settings/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 2156c05a..85c80f93 100644
--- a/Settings/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/Settings/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -34,7 +34,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.jank.InteractionJankMonitor;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SeekBarPreference;
import java.text.NumberFormat;
diff --git a/Settings/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/Settings/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
index 285e8ddb..418ff853 100644
--- a/Settings/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
@@ -23,7 +23,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/app/AllConversationsPreferenceController.java b/Settings/src/com/android/settings/notification/app/AllConversationsPreferenceController.java
index c8631909..a436e18c 100644
--- a/Settings/src/com/android/settings/notification/app/AllConversationsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/AllConversationsPreferenceController.java
@@ -21,7 +21,7 @@ import android.service.notification.ConversationChannelWrapper;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
public class AllConversationsPreferenceController extends ConversationListPreferenceController {
diff --git a/Settings/src/com/android/settings/notification/app/AppBubbleNotificationSettings.java b/Settings/src/com/android/settings/notification/app/AppBubbleNotificationSettings.java
index 3aeb73c9..2f1cb7cf 100644
--- a/Settings/src/com/android/settings/notification/app/AppBubbleNotificationSettings.java
+++ b/Settings/src/com/android/settings/notification/app/AppBubbleNotificationSettings.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.AppBubbleListPreferenceController;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java b/Settings/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
index 200a47b5..26c58e8c 100644
--- a/Settings/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
@@ -35,7 +35,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
@@ -225,7 +225,7 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre
.setDestination(ChannelNotificationSettings.class.getName())
.setArguments(channelArgs)
.setUserHandle(UserHandle.of(mAppRow.userId))
- .setTitleRes(com.android.settings.R.string.notification_channel_title)
+ .setTitleRes(R.string.notification_channel_title)
.setSourceMetricsCategory(SettingsEnums.DND_APPS_BYPASSING)
.launch();
return true;
diff --git a/Settings/src/com/android/settings/notification/app/AppChannelsBypassingDndSettings.java b/Settings/src/com/android/settings/notification/app/AppChannelsBypassingDndSettings.java
index 4fab7e27..a8a49a15 100644
--- a/Settings/src/com/android/settings/notification/app/AppChannelsBypassingDndSettings.java
+++ b/Settings/src/com/android/settings/notification/app/AppChannelsBypassingDndSettings.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/app/AppConversationListPreferenceController.java b/Settings/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
index 4f635764..ce37e2ab 100644
--- a/Settings/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
@@ -29,7 +29,7 @@ import android.service.notification.ConversationChannelWrapper;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.NotificationBackend;
diff --git a/Settings/src/com/android/settings/notification/app/AppNotificationSettings.java b/Settings/src/com/android/settings/notification/app/AppNotificationSettings.java
index 89756b7b..f3d54ea3 100644
--- a/Settings/src/com/android/settings/notification/app/AppNotificationSettings.java
+++ b/Settings/src/com/android/settings/notification/app/AppNotificationSettings.java
@@ -28,7 +28,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/notification/app/BlockPreferenceController.java b/Settings/src/com/android/settings/notification/app/BlockPreferenceController.java
index a3d0a730..24711b1f 100644
--- a/Settings/src/com/android/settings/notification/app/BlockPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/BlockPreferenceController.java
@@ -28,7 +28,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.widget.SettingsMainSwitchPreference;
diff --git a/Settings/src/com/android/settings/notification/app/BubblePreference.java b/Settings/src/com/android/settings/notification/app/BubblePreference.java
index ab5fc393..51e6b6af 100644
--- a/Settings/src/com/android/settings/notification/app/BubblePreference.java
+++ b/Settings/src/com/android/settings/notification/app/BubblePreference.java
@@ -30,7 +30,7 @@ import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreferenceHelper;
diff --git a/Settings/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java b/Settings/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
index 888bd25c..3abaa5ac 100644
--- a/Settings/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
@@ -26,7 +26,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.BubbleHelper;
import com.android.settings.notification.NotificationBackend;
diff --git a/Settings/src/com/android/settings/notification/app/BubbleWarningDialogFragment.java b/Settings/src/com/android/settings/notification/app/BubbleWarningDialogFragment.java
index 7d5b24a3..e4ff9a49 100644
--- a/Settings/src/com/android/settings/notification/app/BubbleWarningDialogFragment.java
+++ b/Settings/src/com/android/settings/notification/app/BubbleWarningDialogFragment.java
@@ -21,7 +21,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class BubbleWarningDialogFragment extends InstrumentedDialogFragment {
diff --git a/Settings/src/com/android/settings/notification/app/ChannelListPreferenceController.java b/Settings/src/com/android/settings/notification/app/ChannelListPreferenceController.java
index 70775926..40558b65 100644
--- a/Settings/src/com/android/settings/notification/app/ChannelListPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/ChannelListPreferenceController.java
@@ -37,7 +37,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/notification/app/ChannelNotificationSettings.java b/Settings/src/com/android/settings/notification/app/ChannelNotificationSettings.java
index a7aba528..a2c33b66 100644
--- a/Settings/src/com/android/settings/notification/app/ChannelNotificationSettings.java
+++ b/Settings/src/com/android/settings/notification/app/ChannelNotificationSettings.java
@@ -29,7 +29,7 @@ import android.util.Log;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/app/ChannelPanelActivity.java b/Settings/src/com/android/settings/notification/app/ChannelPanelActivity.java
index dda1c658..c6a0bab8 100644
--- a/Settings/src/com/android/settings/notification/app/ChannelPanelActivity.java
+++ b/Settings/src/com/android/settings/notification/app/ChannelPanelActivity.java
@@ -33,7 +33,7 @@ import androidx.core.view.WindowInsetsControllerCompat;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
diff --git a/Settings/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java b/Settings/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
index 2b2184e1..bdfaadb3 100644
--- a/Settings/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.widget.EntityHeaderController;
diff --git a/Settings/src/com/android/settings/notification/app/ConversationListPreferenceController.java b/Settings/src/com/android/settings/notification/app/ConversationListPreferenceController.java
index 6703e4e7..566c97f8 100644
--- a/Settings/src/com/android/settings/notification/app/ConversationListPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/ConversationListPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.NotificationBackend;
diff --git a/Settings/src/com/android/settings/notification/app/ConversationListSettings.java b/Settings/src/com/android/settings/notification/app/ConversationListSettings.java
index f2db47da..dd9f5ffc 100644
--- a/Settings/src/com/android/settings/notification/app/ConversationListSettings.java
+++ b/Settings/src/com/android/settings/notification/app/ConversationListSettings.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import android.os.ServiceManager;
import android.service.notification.ConversationChannelWrapper;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/app/ConversationNotificationSettings.java b/Settings/src/com/android/settings/notification/app/ConversationNotificationSettings.java
index 02ea6c06..b1458e55 100644
--- a/Settings/src/com/android/settings/notification/app/ConversationNotificationSettings.java
+++ b/Settings/src/com/android/settings/notification/app/ConversationNotificationSettings.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/notification/app/ConversationPriorityPreference.java b/Settings/src/com/android/settings/notification/app/ConversationPriorityPreference.java
index e1e79603..7b8ca32f 100644
--- a/Settings/src/com/android/settings/notification/app/ConversationPriorityPreference.java
+++ b/Settings/src/com/android/settings/notification/app/ConversationPriorityPreference.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
public class ConversationPriorityPreference extends Preference {
diff --git a/Settings/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java b/Settings/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
index 6a1d4cb1..241c3654 100644
--- a/Settings/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/notification/app/HeaderPreferenceController.java b/Settings/src/com/android/settings/notification/app/HeaderPreferenceController.java
index 220e7b55..f2adf785 100644
--- a/Settings/src/com/android/settings/notification/app/HeaderPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/HeaderPreferenceController.java
@@ -29,7 +29,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.widget.EntityHeaderController;
diff --git a/Settings/src/com/android/settings/notification/app/ImportancePreference.java b/Settings/src/com/android/settings/notification/app/ImportancePreference.java
index be53edae..4e4f581a 100644
--- a/Settings/src/com/android/settings/notification/app/ImportancePreference.java
+++ b/Settings/src/com/android/settings/notification/app/ImportancePreference.java
@@ -37,7 +37,7 @@ import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
public class ImportancePreference extends Preference {
diff --git a/Settings/src/com/android/settings/notification/app/InvalidConversationInfoPreferenceController.java b/Settings/src/com/android/settings/notification/app/InvalidConversationInfoPreferenceController.java
index 478607b1..dbf87862 100644
--- a/Settings/src/com/android/settings/notification/app/InvalidConversationInfoPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/InvalidConversationInfoPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
public class InvalidConversationInfoPreferenceController extends NotificationPreferenceController {
diff --git a/Settings/src/com/android/settings/notification/app/InvalidConversationPreferenceController.java b/Settings/src/com/android/settings/notification/app/InvalidConversationPreferenceController.java
index 5c502dcc..8fc9f493 100644
--- a/Settings/src/com/android/settings/notification/app/InvalidConversationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/InvalidConversationPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/src/com/android/settings/notification/app/NotificationSettings.java b/Settings/src/com/android/settings/notification/app/NotificationSettings.java
index 192a0ee9..64dc00b0 100644
--- a/Settings/src/com/android/settings/notification/app/NotificationSettings.java
+++ b/Settings/src/com/android/settings/notification/app/NotificationSettings.java
@@ -50,7 +50,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/notification/app/NotificationSoundPreference.java b/Settings/src/com/android/settings/notification/app/NotificationSoundPreference.java
index b55f9bd7..60a0d6e1 100644
--- a/Settings/src/com/android/settings/notification/app/NotificationSoundPreference.java
+++ b/Settings/src/com/android/settings/notification/app/NotificationSoundPreference.java
@@ -26,7 +26,7 @@ import android.os.AsyncTask;
import android.util.AttributeSet;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RingtonePreference;
public class NotificationSoundPreference extends RingtonePreference {
diff --git a/Settings/src/com/android/settings/notification/app/NotificationsOffPreferenceController.java b/Settings/src/com/android/settings/notification/app/NotificationsOffPreferenceController.java
index 04e3f0e3..d319e303 100644
--- a/Settings/src/com/android/settings/notification/app/NotificationsOffPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/NotificationsOffPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
public class NotificationsOffPreferenceController extends NotificationPreferenceController
diff --git a/Settings/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java b/Settings/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
index 18fc9178..c42d384c 100644
--- a/Settings/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
@@ -21,7 +21,7 @@ import android.service.notification.ConversationChannelWrapper;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
public class PriorityConversationsPreferenceController extends
diff --git a/Settings/src/com/android/settings/notification/app/RecentConversationPreference.java b/Settings/src/com/android/settings/notification/app/RecentConversationPreference.java
index b60810af..402c4190 100644
--- a/Settings/src/com/android/settings/notification/app/RecentConversationPreference.java
+++ b/Settings/src/com/android/settings/notification/app/RecentConversationPreference.java
@@ -20,7 +20,7 @@ import android.view.View;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.TwoTargetPreference;
import com.google.common.annotations.VisibleForTesting;
diff --git a/Settings/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java b/Settings/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
index f5f2e970..f5688dbd 100644
--- a/Settings/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
@@ -35,7 +35,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.NotificationBackend;
diff --git a/Settings/src/com/android/settings/notification/app/VisibilityPreferenceController.java b/Settings/src/com/android/settings/notification/app/VisibilityPreferenceController.java
index a2a1d76b..15bc2a4e 100644
--- a/Settings/src/com/android/settings/notification/app/VisibilityPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/app/VisibilityPreferenceController.java
@@ -29,7 +29,7 @@ import android.service.notification.NotificationListenerService;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.notification.NotificationBackend;
diff --git a/Settings/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/Settings/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 156df96e..c66cdb7b 100644
--- a/Settings/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/Settings/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -59,7 +59,7 @@ import com.android.internal.logging.UiEvent;
import com.android.internal.logging.UiEventLogger;
import com.android.internal.logging.UiEventLoggerImpl;
import com.android.internal.widget.NotificationExpandButton;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/notification/history/NotificationHistoryAdapter.java b/Settings/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
index 96bc14a6..077ba884 100644
--- a/Settings/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
+++ b/Settings/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
@@ -37,7 +37,7 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.UiEventLogger;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/Settings/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java b/Settings/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
index da1ed118..de3b211e 100644
--- a/Settings/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
+++ b/Settings/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
@@ -22,7 +22,7 @@ import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class NotificationHistoryViewHolder extends RecyclerView.ViewHolder {
diff --git a/Settings/src/com/android/settings/notification/history/NotificationSbnAdapter.java b/Settings/src/com/android/settings/notification/history/NotificationSbnAdapter.java
index c556b551..45a7f497 100644
--- a/Settings/src/com/android/settings/notification/history/NotificationSbnAdapter.java
+++ b/Settings/src/com/android/settings/notification/history/NotificationSbnAdapter.java
@@ -52,7 +52,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.UiEventLogger;
import com.android.internal.util.ContrastColorUtil;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/notification/history/NotificationSbnViewHolder.java b/Settings/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
index df8aec44..74f50d0f 100644
--- a/Settings/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
+++ b/Settings/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
@@ -38,7 +38,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.InstanceId;
import com.android.internal.logging.UiEventLogger;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class NotificationSbnViewHolder extends RecyclerView.ViewHolder {
private static final String TAG = "SbnViewHolder";
diff --git a/Settings/src/com/android/settings/notification/history/NotificationStation.java b/Settings/src/com/android/settings/notification/history/NotificationStation.java
index 3b27e194..bc03e010 100644
--- a/Settings/src/com/android/settings/notification/history/NotificationStation.java
+++ b/Settings/src/com/android/settings/notification/history/NotificationStation.java
@@ -60,7 +60,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenAccessSettings.java b/Settings/src/com/android/settings/notification/zen/ZenAccessSettings.java
index f765d6d2..f9616e96 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenAccessSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenAccessSettings.java
@@ -32,7 +32,7 @@ import android.view.View;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.specialaccess.zenaccess.ZenAccessController;
import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenAutomaticRuleHeaderPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenAutomaticRuleHeaderPreferenceController.java
index 95823feb..9b4a5002 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenAutomaticRuleHeaderPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenAutomaticRuleHeaderPreferenceController.java
@@ -29,7 +29,7 @@ import android.util.Slog;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java
index 4d2a6a58..0ca7c4a0 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.MainSwitchPreference;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleBlockedEffectsSettings.java b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleBlockedEffectsSettings.java
index 0d6cf55a..afed52bd 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleBlockedEffectsSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleBlockedEffectsSettings.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.os.Bundle;
import android.service.notification.ZenPolicy;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleCallsSettings.java b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleCallsSettings.java
index 459e418f..9adbee46 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleCallsSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleCallsSettings.java
@@ -24,7 +24,7 @@ import android.service.notification.ZenPolicy;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.FooterPreference;
@@ -44,7 +44,7 @@ public class ZenCustomRuleCallsSettings extends ZenCustomRuleSettingsBase {
@Override
protected int getPreferenceScreenResId() {
- return com.android.settings.R.xml.zen_mode_custom_rule_calls_settings;
+ return com.cariad.cea.settings.R.xml.zen_mode_custom_rule_calls_settings;
}
@Override
diff --git a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleConfigSettings.java b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleConfigSettings.java
index 7e315990..9ee7a7c1 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleConfigSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleConfigSettings.java
@@ -24,7 +24,7 @@ import android.service.notification.ZenPolicy;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleMessagesSettings.java b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleMessagesSettings.java
index 7b2bd4ad..31b45057 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleMessagesSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleMessagesSettings.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.FooterPreference;
@@ -36,7 +36,7 @@ public class ZenCustomRuleMessagesSettings extends ZenCustomRuleSettingsBase {
@Override
protected int getPreferenceScreenResId() {
- return com.android.settings.R.xml.zen_mode_custom_rule_messages_settings;
+ return com.cariad.cea.settings.R.xml.zen_mode_custom_rule_messages_settings;
}
@Override
diff --git a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleNotificationsSettings.java b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleNotificationsSettings.java
index e688e879..fc7000d4 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleNotificationsSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleNotificationsSettings.java
@@ -19,7 +19,7 @@ package com.android.settings.notification.zen;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleSettings.java b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleSettings.java
index 6ca18a0e..e1bde34d 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleSettings.java
@@ -19,7 +19,7 @@ package com.android.settings.notification.zen;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
index 12605af5..cf87f3c2 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
@@ -24,7 +24,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
@@ -91,7 +91,7 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase {
Preference prefCategory = screen.findPreference(categoryKey);
if (prefCategory != null) {
prefCategory.setTitle(mContext.getResources().getString(
- com.android.settings.R.string.zen_mode_custom_behavior_category_title,
+ com.cariad.cea.settings.R.string.zen_mode_custom_behavior_category_title,
mRule.getName()));
}
}
diff --git a/Settings/src/com/android/settings/notification/zen/ZenDeleteRuleDialog.java b/Settings/src/com/android/settings/notification/zen/ZenDeleteRuleDialog.java
index 057baa0a..e74719e2 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenDeleteRuleDialog.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenDeleteRuleDialog.java
@@ -26,7 +26,7 @@ import android.view.View;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class ZenDeleteRuleDialog extends InstrumentedDialogFragment {
diff --git a/Settings/src/com/android/settings/notification/zen/ZenFooterPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenFooterPreferenceController.java
index 3de76b7b..079a5140 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenFooterPreferenceController.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class ZenFooterPreferenceController extends AbstractZenModePreferenceController {
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java
index 96646105..1283fd0b 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
index f4b7036c..0d92532b 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
index 5f317814..fc6b0e22 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
@@ -29,7 +29,7 @@ import android.view.MenuItem;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ZenServiceListing;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeBackend.java b/Settings/src/com/android/settings/notification/zen/ZenModeBackend.java
index c290c83f..122952c4 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeBackend.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -36,7 +36,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java
index 9332c9b0..3acce270 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java
@@ -24,7 +24,7 @@ import android.service.notification.ZenModeConfig;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class ZenModeBehaviorFooterPreferenceController extends AbstractZenModePreferenceController {
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
index c2962dc8..eb76d893 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
@@ -28,7 +28,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
index dc338bd5..4e56fc08 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
@@ -27,7 +27,7 @@ import android.widget.Button;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.SettingsEnableZenModeDialog;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
index 8d2ae483..eb687722 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
@@ -14,7 +14,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
index 89a80f06..ebafafdb 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeCallsSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
index 93e97b1d..1d50f7e3 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
index 938796b7..7a557ecc 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.notification.zen;
import android.content.Context;
import android.icu.text.MessageFormat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
index 791021d4..9f977177 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
@@ -34,7 +34,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
index 3405c435..99ab6f3d 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModePeoplePreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModePeoplePreferenceController.java
index cb185dd6..e8f0dd52 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModePeoplePreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModePeoplePreferenceController.java
@@ -27,7 +27,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModePeopleSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
index 2b664825..edd88b72 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
@@ -24,7 +24,7 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java
index 78769129..6b9711da 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java
@@ -26,7 +26,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
index f1214307..ab014037 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java b/Settings/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
index ff217b50..04b76cb5 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
@@ -36,7 +36,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeScheduleDaysSelection.java b/Settings/src/com/android/settings/notification/zen/ZenModeScheduleDaysSelection.java
index 98dfd379..9fe48d15 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeScheduleDaysSelection.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeScheduleDaysSelection.java
@@ -25,7 +25,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.LinearLayout;
import android.widget.ScrollView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.text.SimpleDateFormat;
import java.util.Arrays;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
index 577416d4..2ed4bb47 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
@@ -39,7 +39,7 @@ import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeSettings.java
index a707e534..e2d76021 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeSettings.java
@@ -41,7 +41,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java
index 6a574411..a24c2eec 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java
@@ -35,7 +35,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.utils.AnnotationSpan;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java b/Settings/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
index 4f6f0587..90cb2315 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
@@ -37,7 +37,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.slices.CustomSliceRegistry;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
index 1ceb3578..2543d416 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java b/Settings/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
index 61e84fcb..b380b71f 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
@@ -19,7 +19,7 @@ package com.android.settings.notification.zen;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
index cd557e4a..5efd0cb5 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenModeVoiceActivity.java b/Settings/src/com/android/settings/notification/zen/ZenModeVoiceActivity.java
index af937d56..64b4f27a 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenModeVoiceActivity.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenModeVoiceActivity.java
@@ -31,7 +31,7 @@ import android.service.notification.ZenModeConfig;
import android.text.format.DateFormat;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.utils.VoiceSettingsActivity;
import java.util.HashMap;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenOnboardingActivity.java b/Settings/src/com/android/settings/notification/zen/ZenOnboardingActivity.java
index a6e78eb2..3c484ff7 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenOnboardingActivity.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenOnboardingActivity.java
@@ -34,7 +34,7 @@ import android.widget.RadioButton;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenPrioritySendersHelper.java b/Settings/src/com/android/settings/notification/zen/ZenPrioritySendersHelper.java
index 5d0b71b7..1eae3a8f 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenPrioritySendersHelper.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenPrioritySendersHelper.java
@@ -34,7 +34,7 @@ import android.view.View;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.ConversationListSettings;
@@ -105,18 +105,18 @@ public class ZenPrioritySendersHelper {
mPreferenceCategory = preferenceCategory;
if (mPreferenceCategory.getPreferenceCount() == 0) {
makeSelectorPreference(KEY_STARRED,
- com.android.settings.R.string.zen_mode_from_starred, mIsMessages);
+ com.cariad.cea.settings.R.string.zen_mode_from_starred, mIsMessages);
makeSelectorPreference(KEY_CONTACTS,
- com.android.settings.R.string.zen_mode_from_contacts, mIsMessages);
+ com.cariad.cea.settings.R.string.zen_mode_from_contacts, mIsMessages);
if (mIsMessages) {
makeSelectorPreference(KEY_IMPORTANT,
- com.android.settings.R.string.zen_mode_from_important_conversations, true);
+ com.cariad.cea.settings.R.string.zen_mode_from_important_conversations, true);
updateChannelCounts();
}
makeSelectorPreference(KEY_ANY,
- com.android.settings.R.string.zen_mode_from_anyone, mIsMessages);
+ com.cariad.cea.settings.R.string.zen_mode_from_anyone, mIsMessages);
makeSelectorPreference(KEY_NONE,
- com.android.settings.R.string.zen_mode_none_messages, mIsMessages);
+ com.cariad.cea.settings.R.string.zen_mode_none_messages, mIsMessages);
updateSummaries();
}
}
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRuleButtonsPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenRuleButtonsPreferenceController.java
index 082b2a53..a17e788a 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRuleButtonsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRuleButtonsPreferenceController.java
@@ -29,7 +29,7 @@ import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRuleCallsPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenRuleCallsPreferenceController.java
index ace985fe..fb1a0632 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRuleCallsPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRuleCallsPreferenceController.java
@@ -37,7 +37,7 @@ public class ZenRuleCallsPreferenceController extends AbstractZenCustomRulePrefe
public ZenRuleCallsPreferenceController(Context context, String key, Lifecycle lifecycle) {
super(context, key, lifecycle);
mListValues = context.getResources().getStringArray(
- com.android.settings.R.array.zen_mode_contacts_values);
+ com.cariad.cea.settings.R.array.zen_mode_contacts_values);
}
@Override
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRuleMessagesPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenRuleMessagesPreferenceController.java
index 43820942..1e855f88 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRuleMessagesPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRuleMessagesPreferenceController.java
@@ -37,7 +37,7 @@ public class ZenRuleMessagesPreferenceController extends AbstractZenCustomRulePr
public ZenRuleMessagesPreferenceController(Context context, String key, Lifecycle lifecycle) {
super(context, key, lifecycle);
mListValues = context.getResources().getStringArray(
- com.android.settings.R.array.zen_mode_contacts_values);
+ com.cariad.cea.settings.R.array.zen_mode_contacts_values);
}
@Override
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRuleNameDialog.java b/Settings/src/com/android/settings/notification/zen/ZenRuleNameDialog.java
index 222e1440..282e18b1 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRuleNameDialog.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRuleNameDialog.java
@@ -31,7 +31,7 @@ import android.widget.EditText;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class ZenRuleNameDialog extends InstrumentedDialogFragment {
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRuleNotifFooterPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenRuleNotifFooterPreferenceController.java
index 2364327d..e1f78886 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRuleNotifFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRuleNotifFooterPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class ZenRuleNotifFooterPreferenceController extends
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRulePreference.java b/Settings/src/com/android/settings/notification/zen/ZenRulePreference.java
index ed3033a9..b38f9559 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRulePreference.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRulePreference.java
@@ -30,7 +30,7 @@ import android.util.Log;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ZenServiceListing;
import com.android.settingslib.PrimarySwitchPreference;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java b/Settings/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java
index c5717f4a..67bb863b 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java
@@ -86,7 +86,7 @@ public class ZenRuleRepeatCallersPreferenceController extends
private void setRepeatCallerSummary(Preference preference) {
preference.setSummary(mContext.getString(
- com.android.settings.R.string.zen_mode_repeat_callers_summary,
+ com.cariad.cea.settings.R.string.zen_mode_repeat_callers_summary,
mRepeatCallersThreshold));
}
}
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRuleScheduleHelper.java b/Settings/src/com/android/settings/notification/zen/ZenRuleScheduleHelper.java
index 9a4f1084..1e566da0 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRuleScheduleHelper.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRuleScheduleHelper.java
@@ -21,7 +21,7 @@ import android.service.notification.ZenModeConfig.ScheduleInfo;
import android.text.format.DateFormat;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.text.SimpleDateFormat;
import java.util.Calendar;
diff --git a/Settings/src/com/android/settings/notification/zen/ZenRuleSelectionDialog.java b/Settings/src/com/android/settings/notification/zen/ZenRuleSelectionDialog.java
index 71df0144..f4a24b76 100644
--- a/Settings/src/com/android/settings/notification/zen/ZenRuleSelectionDialog.java
+++ b/Settings/src/com/android/settings/notification/zen/ZenRuleSelectionDialog.java
@@ -40,7 +40,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.utils.ZenServiceListing;
diff --git a/Settings/src/com/android/settings/panel/NfcPanel.java b/Settings/src/com/android/settings/panel/NfcPanel.java
index 6b1e4352..ecc14c19 100644
--- a/Settings/src/com/android/settings/panel/NfcPanel.java
+++ b/Settings/src/com/android/settings/panel/NfcPanel.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.slices.CustomSliceRegistry;
diff --git a/Settings/src/com/android/settings/panel/PanelFragment.java b/Settings/src/com/android/settings/panel/PanelFragment.java
index 15902836..4402e973 100644
--- a/Settings/src/com/android/settings/panel/PanelFragment.java
+++ b/Settings/src/com/android/settings/panel/PanelFragment.java
@@ -52,7 +52,7 @@ import androidx.slice.SliceMetadata;
import androidx.slice.widget.SliceLiveData;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.panel.PanelLoggingContract.PanelClosedKeys;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/panel/PanelSlicesAdapter.java b/Settings/src/com/android/settings/panel/PanelSlicesAdapter.java
index a2360d83..c605e6e6 100644
--- a/Settings/src/com/android/settings/panel/PanelSlicesAdapter.java
+++ b/Settings/src/com/android/settings/panel/PanelSlicesAdapter.java
@@ -37,7 +37,7 @@ import androidx.slice.Slice;
import androidx.slice.SliceItem;
import androidx.slice.widget.SliceView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.google.android.setupdesign.DividerItemDecoration;
diff --git a/Settings/src/com/android/settings/panel/SettingsPanelActivity.java b/Settings/src/com/android/settings/panel/SettingsPanelActivity.java
index 60b8f887..9664c8dd 100644
--- a/Settings/src/com/android/settings/panel/SettingsPanelActivity.java
+++ b/Settings/src/com/android/settings/panel/SettingsPanelActivity.java
@@ -36,7 +36,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
diff --git a/Settings/src/com/android/settings/panel/VolumePanel.java b/Settings/src/com/android/settings/panel/VolumePanel.java
index 1a53de09..ea63bbf5 100644
--- a/Settings/src/com/android/settings/panel/VolumePanel.java
+++ b/Settings/src/com/android/settings/panel/VolumePanel.java
@@ -42,7 +42,7 @@ import android.util.Log;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.BluetoothUtils;
diff --git a/Settings/src/com/android/settings/panel/WifiPanel.java b/Settings/src/com/android/settings/panel/WifiPanel.java
index 3e713bcf..61f27fff 100644
--- a/Settings/src/com/android/settings/panel/WifiPanel.java
+++ b/Settings/src/com/android/settings/panel/WifiPanel.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.network.NetworkProviderSettings;
import com.android.settings.slices.CustomSliceRegistry;
diff --git a/Settings/src/com/android/settings/password/ChooseLockGeneric.java b/Settings/src/com/android/settings/password/ChooseLockGeneric.java
index 178c3872..cf07424f 100644
--- a/Settings/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/Settings/src/com/android/settings/password/ChooseLockGeneric.java
@@ -74,7 +74,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
import com.android.settings.EventLogTags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.SetupWizardUtils;
diff --git a/Settings/src/com/android/settings/password/ChooseLockGenericController.java b/Settings/src/com/android/settings/password/ChooseLockGenericController.java
index cd9eb2fd..8eaf49d3 100644
--- a/Settings/src/com/android/settings/password/ChooseLockGenericController.java
+++ b/Settings/src/com/android/settings/password/ChooseLockGenericController.java
@@ -31,7 +31,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/Settings/src/com/android/settings/password/ChooseLockPassword.java b/Settings/src/com/android/settings/password/ChooseLockPassword.java
index 631c735e..36b7ed95 100644
--- a/Settings/src/com/android/settings/password/ChooseLockPassword.java
+++ b/Settings/src/com/android/settings/password/ChooseLockPassword.java
@@ -88,7 +88,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
import com.android.internal.widget.PasswordValidationError;
import com.android.internal.widget.TextViewInputDisabler;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/password/ChooseLockPattern.java b/Settings/src/com/android/settings/password/ChooseLockPattern.java
index 8d0aebe6..48f8a0c6 100644
--- a/Settings/src/com/android/settings/password/ChooseLockPattern.java
+++ b/Settings/src/com/android/settings/password/ChooseLockPattern.java
@@ -52,7 +52,7 @@ import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockPatternView.DisplayMode;
import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/Settings/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
index 6ec70574..7f1bc1f5 100644
--- a/Settings/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
+++ b/Settings/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
@@ -35,7 +35,7 @@ import androidx.appcompat.app.AlertDialog.Builder;
import androidx.fragment.app.Fragment;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
diff --git a/Settings/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/Settings/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index f2ebd1f6..c6b7e8db 100644
--- a/Settings/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/Settings/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -51,7 +51,7 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import java.util.concurrent.Executor;
diff --git a/Settings/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/Settings/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index de3ee517..2d6b3af7 100644
--- a/Settings/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/Settings/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -27,7 +27,7 @@ import android.view.WindowManager;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/Settings/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index 2af360a1..1f6bde61 100644
--- a/Settings/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/Settings/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -54,7 +54,7 @@ import androidx.fragment.app.FragmentManager;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
diff --git a/Settings/src/com/android/settings/password/ConfirmLockPassword.java b/Settings/src/com/android/settings/password/ConfirmLockPassword.java
index b9b1810d..b33c8fa9 100644
--- a/Settings/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/Settings/src/com/android/settings/password/ConfirmLockPassword.java
@@ -63,7 +63,7 @@ import com.android.internal.widget.LockPatternChecker;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
import com.android.internal.widget.TextViewInputDisabler;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.animation.AppearAnimationUtils;
import com.android.settingslib.animation.DisappearAnimationUtils;
diff --git a/Settings/src/com/android/settings/password/ConfirmLockPattern.java b/Settings/src/com/android/settings/password/ConfirmLockPattern.java
index 3415478c..4824e443 100644
--- a/Settings/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/Settings/src/com/android/settings/password/ConfirmLockPattern.java
@@ -53,7 +53,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.animation.AppearAnimationCreator;
import com.android.settingslib.animation.AppearAnimationUtils;
import com.android.settingslib.animation.DisappearAnimationUtils;
diff --git a/Settings/src/com/android/settings/password/ForgotPasswordActivity.java b/Settings/src/com/android/settings/password/ForgotPasswordActivity.java
index ae050853..9005b21f 100644
--- a/Settings/src/com/android/settings/password/ForgotPasswordActivity.java
+++ b/Settings/src/com/android/settings/password/ForgotPasswordActivity.java
@@ -28,7 +28,7 @@ import android.os.UserManager;
import android.util.Log;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
diff --git a/Settings/src/com/android/settings/password/PasswordRequirementAdapter.java b/Settings/src/com/android/settings/password/PasswordRequirementAdapter.java
index 7cf6a00e..97ba8e6e 100644
--- a/Settings/src/com/android/settings/password/PasswordRequirementAdapter.java
+++ b/Settings/src/com/android/settings/password/PasswordRequirementAdapter.java
@@ -25,7 +25,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder;
/**
diff --git a/Settings/src/com/android/settings/password/PasswordUtils.java b/Settings/src/com/android/settings/password/PasswordUtils.java
index a54df94f..eec5411c 100644
--- a/Settings/src/com/android/settings/password/PasswordUtils.java
+++ b/Settings/src/com/android/settings/password/PasswordUtils.java
@@ -34,7 +34,7 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
public final class PasswordUtils extends com.android.settingslib.Utils {
diff --git a/Settings/src/com/android/settings/password/SaveAndFinishWorker.java b/Settings/src/com/android/settings/password/SaveAndFinishWorker.java
index 40054b77..3eac621f 100644
--- a/Settings/src/com/android/settings/password/SaveAndFinishWorker.java
+++ b/Settings/src/com/android/settings/password/SaveAndFinishWorker.java
@@ -30,7 +30,7 @@ import androidx.fragment.app.Fragment;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
import com.android.internal.widget.VerifyCredentialResponse;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.safetycenter.LockScreenSafetySource;
/**
diff --git a/Settings/src/com/android/settings/password/SetupChooseLockGeneric.java b/Settings/src/com/android/settings/password/SetupChooseLockGeneric.java
index 7c0769e3..b8a24900 100644
--- a/Settings/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/Settings/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -40,7 +40,7 @@ import androidx.preference.PreferenceFragmentCompat;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.utils.SettingsDividerItemDecoration;
diff --git a/Settings/src/com/android/settings/password/SetupChooseLockPassword.java b/Settings/src/com/android/settings/password/SetupChooseLockPassword.java
index f7bf0149..2979f19c 100644
--- a/Settings/src/com/android/settings/password/SetupChooseLockPassword.java
+++ b/Settings/src/com/android/settings/password/SetupChooseLockPassword.java
@@ -31,7 +31,7 @@ import android.widget.Button;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
diff --git a/Settings/src/com/android/settings/password/SetupChooseLockPattern.java b/Settings/src/com/android/settings/password/SetupChooseLockPattern.java
index 55b38471..d8087412 100644
--- a/Settings/src/com/android/settings/password/SetupChooseLockPattern.java
+++ b/Settings/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -32,7 +32,7 @@ import android.widget.Button;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupRedactionInterstitial;
import com.google.android.setupcompat.util.WizardManagerHelper;
diff --git a/Settings/src/com/android/settings/password/SetupSkipDialog.java b/Settings/src/com/android/settings/password/SetupSkipDialog.java
index 9049da73..cda97bcd 100644
--- a/Settings/src/com/android/settings/password/SetupSkipDialog.java
+++ b/Settings/src/com/android/settings/password/SetupSkipDialog.java
@@ -38,7 +38,7 @@ import androidx.annotation.StringRes;
import androidx.fragment.app.FragmentManager;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/print/PrintJobPreferenceController.java b/Settings/src/com/android/settings/print/PrintJobPreferenceController.java
index 0eff0d6d..3010d9aa 100644
--- a/Settings/src/com/android/settings/print/PrintJobPreferenceController.java
+++ b/Settings/src/com/android/settings/print/PrintJobPreferenceController.java
@@ -21,7 +21,7 @@ import android.print.PrintJob;
import android.print.PrintJobInfo;
import android.text.format.DateUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.text.DateFormat;
diff --git a/Settings/src/com/android/settings/print/PrintJobSettingsFragment.java b/Settings/src/com/android/settings/print/PrintJobSettingsFragment.java
index eeb8ed45..f56fb250 100644
--- a/Settings/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/Settings/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -25,7 +25,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
/**
diff --git a/Settings/src/com/android/settings/print/PrintServiceSettingsFragment.java b/Settings/src/com/android/settings/print/PrintServiceSettingsFragment.java
index e144ffdd..c22b53e6 100644
--- a/Settings/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/Settings/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -58,7 +58,7 @@ import androidx.loader.content.Loader;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SettingsMainSwitchBar;
diff --git a/Settings/src/com/android/settings/print/PrintSettingPreferenceController.java b/Settings/src/com/android/settings/print/PrintSettingPreferenceController.java
index 8714a118..83c510df 100644
--- a/Settings/src/com/android/settings/print/PrintSettingPreferenceController.java
+++ b/Settings/src/com/android/settings/print/PrintSettingPreferenceController.java
@@ -28,7 +28,7 @@ import android.printservice.PrintServiceInfo;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/print/PrintSettingsFragment.java b/Settings/src/com/android/settings/print/PrintSettingsFragment.java
index cd809981..29859de2 100644
--- a/Settings/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/Settings/src/com/android/settings/print/PrintSettingsFragment.java
@@ -53,7 +53,7 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/print/ProfileSettingsPreferenceFragment.java b/Settings/src/com/android/settings/print/ProfileSettingsPreferenceFragment.java
index 63b83f1b..72809aca 100644
--- a/Settings/src/com/android/settings/print/ProfileSettingsPreferenceFragment.java
+++ b/Settings/src/com/android/settings/print/ProfileSettingsPreferenceFragment.java
@@ -26,7 +26,7 @@ import android.view.View;
import android.widget.AdapterView;
import android.widget.Spinner;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.dashboard.profileselector.UserAdapter;
diff --git a/Settings/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java b/Settings/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java
index a78ccee2..f8c2b43c 100644
--- a/Settings/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java
+++ b/Settings/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java
@@ -23,7 +23,7 @@ import android.view.accessibility.AccessibilityManager;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceController.java b/Settings/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceController.java
index 1d9c3543..9e3730dd 100644
--- a/Settings/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceController.java
+++ b/Settings/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceController.java
@@ -21,7 +21,7 @@ import static android.provider.Settings.Secure.CAMERA_EXTENSIONS_FALLBACK;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java b/Settings/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
index c3830c19..54bacfc6 100644
--- a/Settings/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
+++ b/Settings/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
@@ -22,7 +22,7 @@ import android.os.UserManager;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.utils.ContentCaptureUtils;
diff --git a/Settings/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java b/Settings/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
index c8a54712..5aaa0310 100644
--- a/Settings/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
+++ b/Settings/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
import com.android.settings.utils.ContentCaptureUtils;
diff --git a/Settings/src/com/android/settings/privacy/PrivacyControlsFragment.java b/Settings/src/com/android/settings/privacy/PrivacyControlsFragment.java
index e40ed94c..1d2d88ff 100644
--- a/Settings/src/com/android/settings/privacy/PrivacyControlsFragment.java
+++ b/Settings/src/com/android/settings/privacy/PrivacyControlsFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.privacy;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/privacy/PrivacyDashboardFragment.java b/Settings/src/com/android/settings/privacy/PrivacyDashboardFragment.java
index 04b10d2f..85f56ee3 100644
--- a/Settings/src/com/android/settings/privacy/PrivacyDashboardFragment.java
+++ b/Settings/src/com/android/settings/privacy/PrivacyDashboardFragment.java
@@ -23,7 +23,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
diff --git a/Settings/src/com/android/settings/privacy/SensorToggleController.java b/Settings/src/com/android/settings/privacy/SensorToggleController.java
index 7aa9f9f4..30064eba 100644
--- a/Settings/src/com/android/settings/privacy/SensorToggleController.java
+++ b/Settings/src/com/android/settings/privacy/SensorToggleController.java
@@ -24,7 +24,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.utils.SensorPrivacyManagerHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
diff --git a/Settings/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java b/Settings/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
index ad57073d..1f6bf740 100644
--- a/Settings/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
+++ b/Settings/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
@@ -27,7 +27,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java b/Settings/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
index 1f0f7bb6..189ac50a 100644
--- a/Settings/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
+++ b/Settings/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
@@ -40,7 +40,7 @@ import androidx.activity.OnBackPressedCallback;
import androidx.annotation.Nullable;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.airbnb.lottie.LottieAnimationView;
diff --git a/Settings/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java b/Settings/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
index 124978a5..377e5f24 100644
--- a/Settings/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
+++ b/Settings/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
@@ -19,7 +19,7 @@ package com.android.settings.privatespace;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
public class HidePrivateSpaceSettings extends DashboardFragment{
diff --git a/Settings/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java b/Settings/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
index 42627af9..e62f27aa 100644
--- a/Settings/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
+++ b/Settings/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
@@ -21,7 +21,7 @@ import static android.provider.Settings.Secure.HIDE_PRIVATESPACE_ENTRY_POINT;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java b/Settings/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
index 12a74400..c348ddf2 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
@@ -37,7 +37,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/privatespace/PrivateProfileCreationError.java b/Settings/src/com/android/settings/privatespace/PrivateProfileCreationError.java
index fa890d5a..277165f4 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateProfileCreationError.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateProfileCreationError.java
@@ -28,7 +28,7 @@ import androidx.activity.OnBackPressedCallback;
import androidx.annotation.Nullable;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java b/Settings/src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java
index 48a5a7fe..443c62e9 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java
@@ -27,7 +27,7 @@ import androidx.activity.OnBackPressedCallback;
import androidx.annotation.Nullable;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java b/Settings/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
index 63b1dc95..0aa0eb61 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
@@ -40,7 +40,7 @@ import androidx.fragment.app.FragmentActivity;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.SetScreenLockDialogActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.transition.SettingsTransitionHelper;
diff --git a/Settings/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java b/Settings/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
index 726567e0..7b3ba979 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
/** Fragment representing the Private Space dashboard in Settings. */
diff --git a/Settings/src/com/android/settings/privatespace/PrivateSpaceEducation.java b/Settings/src/com/android/settings/privatespace/PrivateSpaceEducation.java
index 4c99873c..8b92c7b9 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateSpaceEducation.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateSpaceEducation.java
@@ -27,7 +27,7 @@ import android.view.ViewGroup;
import androidx.annotation.Nullable;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java b/Settings/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java
index 0fa04834..cd949133 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java
@@ -33,7 +33,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java b/Settings/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
index 6729830a..6b1d289f 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
@@ -26,7 +26,7 @@ import android.safetycenter.SafetySourceData;
import android.safetycenter.SafetySourceStatus;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
/** Private Space safety source for the Safety Center */
diff --git a/Settings/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java b/Settings/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
index 4a1e29b2..14b0cd75 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
@@ -32,7 +32,7 @@ import androidx.activity.OnBackPressedCallback;
import androidx.annotation.Nullable;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java b/Settings/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
index 78c96dcc..8591cea2 100644
--- a/Settings/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
+++ b/Settings/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
@@ -24,7 +24,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/privatespace/SetupSuccessFragment.java b/Settings/src/com/android/settings/privatespace/SetupSuccessFragment.java
index 13de1fc9..0a223ab4 100644
--- a/Settings/src/com/android/settings/privatespace/SetupSuccessFragment.java
+++ b/Settings/src/com/android/settings/privatespace/SetupSuccessFragment.java
@@ -31,7 +31,7 @@ import android.widget.Toast;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java b/Settings/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
index a7a12a49..c092618f 100644
--- a/Settings/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
+++ b/Settings/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
@@ -21,7 +21,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java b/Settings/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
index ef8bf8e8..629c6e3e 100644
--- a/Settings/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
+++ b/Settings/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
@@ -27,7 +27,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java b/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java
index a4109b86..9586b226 100644
--- a/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java
+++ b/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java
@@ -21,7 +21,7 @@ import android.os.Bundle;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.core.InstrumentedActivity;
diff --git a/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragment.java b/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragment.java
index 7dd3a5b0..69e0dcda 100644
--- a/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragment.java
+++ b/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragment.java
@@ -37,7 +37,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.navigation.fragment.NavHostFragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java b/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java
index 3a166413..bf33420c 100644
--- a/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java
+++ b/Settings/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java
@@ -35,7 +35,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java b/Settings/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
index 2e3f2840..0f77c035 100644
--- a/Settings/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
+++ b/Settings/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
@@ -22,7 +22,7 @@ import android.util.Log;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.combination.CombinedBiometricStatusPreferenceController;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java b/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java
index dc00885c..63e7e5e3 100644
--- a/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java
+++ b/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.os.UserHandle;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.combination.BiometricsSettingsBase;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java b/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java
index b841d9ad..1282f633 100644
--- a/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java
+++ b/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java
@@ -25,7 +25,7 @@ import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java b/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java
index d4849046..ed18362d 100644
--- a/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java
+++ b/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.combination.BiometricFingerprintStatusPreferenceController;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java b/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
index efbe9f92..6d0a8ab3 100644
--- a/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
+++ b/Settings/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
@@ -33,7 +33,7 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/privatespace/onelock/UseOneLockController.java b/Settings/src/com/android/settings/privatespace/onelock/UseOneLockController.java
index 31634b9e..1f162008 100644
--- a/Settings/src/com/android/settings/privatespace/onelock/UseOneLockController.java
+++ b/Settings/src/com/android/settings/privatespace/onelock/UseOneLockController.java
@@ -25,7 +25,7 @@ import android.os.UserHandle;
import android.util.Log;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java b/Settings/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
index fd7d02b6..62a87a76 100644
--- a/Settings/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
+++ b/Settings/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
@@ -37,7 +37,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java b/Settings/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
index 413e02a1..384c33cb 100644
--- a/Settings/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
+++ b/Settings/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
diff --git a/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekController.java b/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekController.java
index 574e62f9..9bfd46ce 100644
--- a/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekController.java
+++ b/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import androidx.core.text.util.LocalePreferences;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.Locale;
diff --git a/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemFragment.java b/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemFragment.java
index 72a841e0..c10782c0 100644
--- a/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemFragment.java
+++ b/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java b/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java
index d509d2e2..21e6db67 100644
--- a/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java
+++ b/Settings/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java
@@ -19,7 +19,7 @@ package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** A controller for handling all first day of week preferences. */
public class FirstDayOfWeekItemListController extends
diff --git a/Settings/src/com/android/settings/regionalpreferences/NumberingPreferencesFragment.java b/Settings/src/com/android/settings/regionalpreferences/NumberingPreferencesFragment.java
index 1c5015fe..a5edba3d 100644
--- a/Settings/src/com/android/settings/regionalpreferences/NumberingPreferencesFragment.java
+++ b/Settings/src/com/android/settings/regionalpreferences/NumberingPreferencesFragment.java
@@ -24,7 +24,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.app.LocaleHelper;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/regionalpreferences/RegionalFooterPreferenceController.java b/Settings/src/com/android/settings/regionalpreferences/RegionalFooterPreferenceController.java
index 6ba9d187..57d29973 100644
--- a/Settings/src/com/android/settings/regionalpreferences/RegionalFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/regionalpreferences/RegionalFooterPreferenceController.java
@@ -23,7 +23,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/regionalpreferences/RegionalPreferencesDataUtils.java b/Settings/src/com/android/settings/regionalpreferences/RegionalPreferencesDataUtils.java
index d1ae40b2..2d2bef1a 100644
--- a/Settings/src/com/android/settings/regionalpreferences/RegionalPreferencesDataUtils.java
+++ b/Settings/src/com/android/settings/regionalpreferences/RegionalPreferencesDataUtils.java
@@ -25,7 +25,7 @@ import android.text.TextUtils;
import androidx.core.text.util.LocalePreferences;
import com.android.internal.app.LocalePicker;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Locale;
diff --git a/Settings/src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java b/Settings/src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java
index 848febcf..8063eaac 100644
--- a/Settings/src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java
+++ b/Settings/src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java
@@ -18,7 +18,7 @@ package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitController.java b/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitController.java
index 4b0f22c8..da569124 100644
--- a/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitController.java
+++ b/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitController.java
@@ -21,7 +21,7 @@ import android.provider.Settings;
import androidx.core.text.util.LocalePreferences;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.Locale;
diff --git a/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitFragment.java b/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitFragment.java
index 7c9b6af8..3a96713c 100644
--- a/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitFragment.java
+++ b/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitListController.java b/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitListController.java
index 91ab1a25..6bc7514b 100644
--- a/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitListController.java
+++ b/Settings/src/com/android/settings/regionalpreferences/TemperatureUnitListController.java
@@ -19,7 +19,7 @@ package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** A controller for handling all temperature preferences. */
public class TemperatureUnitListController extends RegionalPreferenceListBasePreferenceController {
diff --git a/Settings/src/com/android/settings/remoteauth/RemoteAuthActivity.kt b/Settings/src/com/android/settings/remoteauth/RemoteAuthActivity.kt
index b339066e..937d35a3 100644
--- a/Settings/src/com/android/settings/remoteauth/RemoteAuthActivity.kt
+++ b/Settings/src/com/android/settings/remoteauth/RemoteAuthActivity.kt
@@ -21,7 +21,7 @@ import android.os.Bundle
import androidx.annotation.IdRes
import androidx.navigation.fragment.NavHostFragment
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.SetupWizardUtils
import com.android.settings.core.InstrumentedActivity
import com.google.android.setupdesign.util.ThemeHelper
diff --git a/Settings/src/com/android/settings/remoteauth/RemoteAuthStatusUtils.kt b/Settings/src/com/android/settings/remoteauth/RemoteAuthStatusUtils.kt
index 2bbc14bf..da39d66d 100644
--- a/Settings/src/com/android/settings/remoteauth/RemoteAuthStatusUtils.kt
+++ b/Settings/src/com/android/settings/remoteauth/RemoteAuthStatusUtils.kt
@@ -17,7 +17,7 @@
package com.android.settings.remoteauth
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
/**
* Utilities for remoteauth details shared between Security Settings and Safety Center.
diff --git a/Settings/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt b/Settings/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt
index 5a93259b..c5152d8d 100644
--- a/Settings/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt
+++ b/Settings/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt
@@ -30,7 +30,7 @@ import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.remoteauth.RemoteAuthEnrollBase
import com.google.android.setupcompat.template.FooterButton
diff --git a/Settings/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt b/Settings/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt
index 323c41f0..f68fbe41 100644
--- a/Settings/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt
+++ b/Settings/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt
@@ -22,7 +22,7 @@ import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
-import com.android.settings.R
+import com.cariad.cea.settings.R
class RemoteAuthEnrollEnrollingRecyclerViewAdapter :
RecyclerView.Adapter() {
diff --git a/Settings/src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinish.kt b/Settings/src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinish.kt
index ac964848..f19a059d 100644
--- a/Settings/src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinish.kt
+++ b/Settings/src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinish.kt
@@ -20,7 +20,7 @@ import android.os.Bundle
import android.view.View
import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
import com.airbnb.lottie.LottieAnimationView
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.remoteauth.RemoteAuthEnrollBase
import com.android.settingslib.widget.LottieColorUtils
import com.google.android.setupcompat.template.FooterButton
diff --git a/Settings/src/com/android/settings/remoteauth/introduction/IntroductionImageCarousel.kt b/Settings/src/com/android/settings/remoteauth/introduction/IntroductionImageCarousel.kt
index ad857635..523b117a 100644
--- a/Settings/src/com/android/settings/remoteauth/introduction/IntroductionImageCarousel.kt
+++ b/Settings/src/com/android/settings/remoteauth/introduction/IntroductionImageCarousel.kt
@@ -34,7 +34,7 @@ import androidx.viewpager2.widget.ViewPager2
import com.airbnb.lottie.LottieAnimationView
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.widget.LottieColorUtils
class IntroductionImageCarousel : ConstraintLayout {
diff --git a/Settings/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt b/Settings/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt
index b0d3f794..26c34130 100644
--- a/Settings/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt
+++ b/Settings/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt
@@ -21,7 +21,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.remoteauth.RemoteAuthEnrollBase
import com.google.android.setupcompat.template.FooterButton
import com.google.android.setupdesign.template.RequireScrollMixin
diff --git a/Settings/src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt b/Settings/src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt
index 9cf2511b..46ce81c9 100644
--- a/Settings/src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt
+++ b/Settings/src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt
@@ -27,7 +27,7 @@ import androidx.lifecycle.repeatOnLifecycle
import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import com.android.settings.R
+import com.cariad.cea.settings.R
import kotlinx.coroutines.launch
class RemoteAuthSettings : Fragment(R.layout.remote_auth_settings) {
diff --git a/Settings/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt b/Settings/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt
index f8038bd9..e7ddabe3 100644
--- a/Settings/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt
+++ b/Settings/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt
@@ -23,7 +23,7 @@ import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
-import com.android.settings.R
+import com.cariad.cea.settings.R
class RemoteAuthSettingsRecyclerViewAdapter() :
RecyclerView.Adapter() {
diff --git a/Settings/src/com/android/settings/safetycenter/LockScreenSafetySource.java b/Settings/src/com/android/settings/safetycenter/LockScreenSafetySource.java
index 6960fc6c..a0ea08c6 100644
--- a/Settings/src/com/android/settings/safetycenter/LockScreenSafetySource.java
+++ b/Settings/src/com/android/settings/safetycenter/LockScreenSafetySource.java
@@ -30,7 +30,7 @@ import android.safetycenter.SafetySourceIssue;
import android.safetycenter.SafetySourceStatus;
import android.safetycenter.SafetySourceStatus.IconAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.security.ScreenLockPreferenceDetailsUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
diff --git a/Settings/src/com/android/settings/safetycenter/MoreSecurityPrivacyFragment.java b/Settings/src/com/android/settings/safetycenter/MoreSecurityPrivacyFragment.java
index 34f8a535..1f676e6b 100644
--- a/Settings/src/com/android/settings/safetycenter/MoreSecurityPrivacyFragment.java
+++ b/Settings/src/com/android/settings/safetycenter/MoreSecurityPrivacyFragment.java
@@ -24,7 +24,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/safetycenter/SafetyCenterUtils.java b/Settings/src/com/android/settings/safetycenter/SafetyCenterUtils.java
index e0665302..c5996f65 100644
--- a/Settings/src/com/android/settings/safetycenter/SafetyCenterUtils.java
+++ b/Settings/src/com/android/settings/safetycenter/SafetyCenterUtils.java
@@ -30,7 +30,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.combination.CombinedBiometricProfileStatusPreferenceController;
import com.android.settings.biometrics.face.FaceProfileStatusPreferenceController;
import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
diff --git a/Settings/src/com/android/settings/search/SearchFeatureProvider.java b/Settings/src/com/android/settings/search/SearchFeatureProvider.java
index 5707bc28..71d54fb2 100644
--- a/Settings/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/Settings/src/com/android/settings/search/SearchFeatureProvider.java
@@ -32,7 +32,7 @@ import android.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/Settings/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index 3b041867..361c5407 100644
--- a/Settings/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/Settings/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -63,7 +63,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.slice.SliceViewManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.CategoryManager;
import com.android.settings.dashboard.DashboardFeatureProvider;
diff --git a/Settings/src/com/android/settings/search/actionbar/SearchMenuController.java b/Settings/src/com/android/settings/search/actionbar/SearchMenuController.java
index 74494210..3efd22dc 100644
--- a/Settings/src/com/android/settings/search/actionbar/SearchMenuController.java
+++ b/Settings/src/com/android/settings/search/actionbar/SearchMenuController.java
@@ -28,7 +28,7 @@ import android.view.MenuItem;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.InstrumentedPreferenceFragment;
diff --git a/Settings/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/Settings/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
index 7c946c3c..b10cda48 100644
--- a/Settings/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
+++ b/Settings/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
@@ -25,7 +25,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/security/ContentProtectionPreferenceFragment.java b/Settings/src/com/android/settings/security/ContentProtectionPreferenceFragment.java
index c65fd960..a9c7078b 100644
--- a/Settings/src/com/android/settings/security/ContentProtectionPreferenceFragment.java
+++ b/Settings/src/com/android/settings/security/ContentProtectionPreferenceFragment.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/security/ContentProtectionTogglePreferenceController.java b/Settings/src/com/android/settings/security/ContentProtectionTogglePreferenceController.java
index 101364b6..0e136143 100644
--- a/Settings/src/com/android/settings/security/ContentProtectionTogglePreferenceController.java
+++ b/Settings/src/com/android/settings/security/ContentProtectionTogglePreferenceController.java
@@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.SettingsMainSwitchPreference;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/src/com/android/settings/security/ContentProtectionWorkSwitchController.java b/Settings/src/com/android/settings/security/ContentProtectionWorkSwitchController.java
index 0404dcde..3c26c267 100644
--- a/Settings/src/com/android/settings/security/ContentProtectionWorkSwitchController.java
+++ b/Settings/src/com/android/settings/security/ContentProtectionWorkSwitchController.java
@@ -24,7 +24,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/src/com/android/settings/security/CredentialManagementAppAdapter.java b/Settings/src/com/android/settings/security/CredentialManagementAppAdapter.java
index 567cffda..852d4af4 100644
--- a/Settings/src/com/android/settings/security/CredentialManagementAppAdapter.java
+++ b/Settings/src/com/android/settings/security/CredentialManagementAppAdapter.java
@@ -33,7 +33,7 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.StringUtil;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/security/CredentialManagementAppButtonsController.java b/Settings/src/com/android/settings/security/CredentialManagementAppButtonsController.java
index 250dd133..5f57c517 100644
--- a/Settings/src/com/android/settings/security/CredentialManagementAppButtonsController.java
+++ b/Settings/src/com/android/settings/security/CredentialManagementAppButtonsController.java
@@ -34,7 +34,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.widget.ActionButtonsPreference;
diff --git a/Settings/src/com/android/settings/security/CredentialManagementAppFragment.java b/Settings/src/com/android/settings/security/CredentialManagementAppFragment.java
index 74ce0030..0600455b 100644
--- a/Settings/src/com/android/settings/security/CredentialManagementAppFragment.java
+++ b/Settings/src/com/android/settings/security/CredentialManagementAppFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.security;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/security/CredentialManagementAppHeaderController.java b/Settings/src/com/android/settings/security/CredentialManagementAppHeaderController.java
index 03720e68..83aaa295 100644
--- a/Settings/src/com/android/settings/security/CredentialManagementAppHeaderController.java
+++ b/Settings/src/com/android/settings/security/CredentialManagementAppHeaderController.java
@@ -31,7 +31,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.LayoutPreference;
diff --git a/Settings/src/com/android/settings/security/CredentialManagementAppPolicyPreference.java b/Settings/src/com/android/settings/security/CredentialManagementAppPolicyPreference.java
index 1747be30..8335d655 100644
--- a/Settings/src/com/android/settings/security/CredentialManagementAppPolicyPreference.java
+++ b/Settings/src/com/android/settings/security/CredentialManagementAppPolicyPreference.java
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/Settings/src/com/android/settings/security/CredentialManagementAppPreferenceController.java b/Settings/src/com/android/settings/security/CredentialManagementAppPreferenceController.java
index ae257149..ab3ab419 100644
--- a/Settings/src/com/android/settings/security/CredentialManagementAppPreferenceController.java
+++ b/Settings/src/com/android/settings/security/CredentialManagementAppPreferenceController.java
@@ -29,7 +29,7 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.concurrent.ExecutorService;
diff --git a/Settings/src/com/android/settings/security/CredentialStorage.java b/Settings/src/com/android/settings/security/CredentialStorage.java
index ea336314..0b8a4d99 100644
--- a/Settings/src/com/android/settings/security/CredentialStorage.java
+++ b/Settings/src/com/android/settings/security/CredentialStorage.java
@@ -43,7 +43,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.vpn2.VpnUtils;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
diff --git a/Settings/src/com/android/settings/security/EncryptionAndCredential.java b/Settings/src/com/android/settings/security/EncryptionAndCredential.java
index e3dd9d5c..acb66f72 100644
--- a/Settings/src/com/android/settings/security/EncryptionAndCredential.java
+++ b/Settings/src/com/android/settings/security/EncryptionAndCredential.java
@@ -21,7 +21,7 @@ import static com.android.settings.security.EncryptionStatusPreferenceController
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.PreferenceCategoryController;
diff --git a/Settings/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/Settings/src/com/android/settings/security/EncryptionStatusPreferenceController.java
index 68d1181a..ec6a889e 100644
--- a/Settings/src/com/android/settings/security/EncryptionStatusPreferenceController.java
+++ b/Settings/src/com/android/settings/security/EncryptionStatusPreferenceController.java
@@ -23,7 +23,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class EncryptionStatusPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/security/InstallCaCertificateWarning.java b/Settings/src/com/android/settings/security/InstallCaCertificateWarning.java
index 3335fe61..bc7c14a4 100644
--- a/Settings/src/com/android/settings/security/InstallCaCertificateWarning.java
+++ b/Settings/src/com/android/settings/security/InstallCaCertificateWarning.java
@@ -27,7 +27,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/src/com/android/settings/security/InstallCertificateFromStorage.java b/Settings/src/com/android/settings/security/InstallCertificateFromStorage.java
index 38105318..7976076d 100644
--- a/Settings/src/com/android/settings/security/InstallCertificateFromStorage.java
+++ b/Settings/src/com/android/settings/security/InstallCertificateFromStorage.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/security/LockUnificationPreferenceController.java b/Settings/src/com/android/settings/security/LockUnificationPreferenceController.java
index e9931df1..a1264e38 100644
--- a/Settings/src/com/android/settings/security/LockUnificationPreferenceController.java
+++ b/Settings/src/com/android/settings/security/LockUnificationPreferenceController.java
@@ -34,7 +34,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
diff --git a/Settings/src/com/android/settings/security/LockscreenDashboardFragment.java b/Settings/src/com/android/settings/security/LockscreenDashboardFragment.java
index 2e4a1f28..598d40a3 100644
--- a/Settings/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/Settings/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -31,7 +31,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController;
import com.android.settings.display.AmbientDisplayNotificationsPreferenceController;
diff --git a/Settings/src/com/android/settings/security/MemtagFooterPreferenceController.java b/Settings/src/com/android/settings/security/MemtagFooterPreferenceController.java
index bcdabb05..c1a15399 100644
--- a/Settings/src/com/android/settings/security/MemtagFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/security/MemtagFooterPreferenceController.java
@@ -21,7 +21,7 @@ import android.text.TextUtils;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/src/com/android/settings/security/MemtagHelper.java b/Settings/src/com/android/settings/security/MemtagHelper.java
index 69639c26..f4cb8315 100644
--- a/Settings/src/com/android/settings/security/MemtagHelper.java
+++ b/Settings/src/com/android/settings/security/MemtagHelper.java
@@ -20,7 +20,7 @@ import android.os.SystemProperties;
import android.text.TextUtils;
import com.android.internal.os.Zygote;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.Arrays;
diff --git a/Settings/src/com/android/settings/security/MemtagPage.java b/Settings/src/com/android/settings/security/MemtagPage.java
index f1ffcb1b..3b60c040 100644
--- a/Settings/src/com/android/settings/security/MemtagPage.java
+++ b/Settings/src/com/android/settings/security/MemtagPage.java
@@ -19,7 +19,7 @@ package com.android.settings.security;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/security/MemtagPreferenceController.java b/Settings/src/com/android/settings/security/MemtagPreferenceController.java
index 5e224a1e..3c74a07b 100644
--- a/Settings/src/com/android/settings/security/MemtagPreferenceController.java
+++ b/Settings/src/com/android/settings/security/MemtagPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/src/com/android/settings/security/MemtagRebootDialog.java b/Settings/src/com/android/settings/security/MemtagRebootDialog.java
index adedff8a..d881f5f2 100644
--- a/Settings/src/com/android/settings/security/MemtagRebootDialog.java
+++ b/Settings/src/com/android/settings/security/MemtagRebootDialog.java
@@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class MemtagRebootDialog extends InstrumentedDialogFragment
diff --git a/Settings/src/com/android/settings/security/OwnerInfoPreferenceController.java b/Settings/src/com/android/settings/security/OwnerInfoPreferenceController.java
index 24830167..3159b41d 100644
--- a/Settings/src/com/android/settings/security/OwnerInfoPreferenceController.java
+++ b/Settings/src/com/android/settings/security/OwnerInfoPreferenceController.java
@@ -111,7 +111,7 @@ public class OwnerInfoPreferenceController extends AbstractPreferenceController
mOwnerInfoPref.setSummary(isOwnerInfoEnabled()
? getOwnerInfo()
: mContext.getString(
- com.android.settings.R.string.owner_info_settings_summary));
+ com.cariad.cea.settings.R.string.owner_info_settings_summary));
}
}
}
diff --git a/Settings/src/com/android/settings/security/RequestManageCredentials.java b/Settings/src/com/android/settings/security/RequestManageCredentials.java
index 2c1b4521..47b2140b 100644
--- a/Settings/src/com/android/settings/security/RequestManageCredentials.java
+++ b/Settings/src/com/android/settings/security/RequestManageCredentials.java
@@ -51,7 +51,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
diff --git a/Settings/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java b/Settings/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java
index 88477c36..2c8cd862 100644
--- a/Settings/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java
+++ b/Settings/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java
@@ -27,7 +27,7 @@ import androidx.annotation.StringRes;
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/security/ScreenPinningPreferenceController.java b/Settings/src/com/android/settings/security/ScreenPinningPreferenceController.java
index c72d0181..f8f66747 100644
--- a/Settings/src/com/android/settings/security/ScreenPinningPreferenceController.java
+++ b/Settings/src/com/android/settings/security/ScreenPinningPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.security;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
public class ScreenPinningPreferenceController extends BasePreferenceController {
diff --git a/Settings/src/com/android/settings/security/ScreenPinningSettings.java b/Settings/src/com/android/settings/security/ScreenPinningSettings.java
index 8690847b..aaf1d497 100644
--- a/Settings/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/Settings/src/com/android/settings/security/ScreenPinningSettings.java
@@ -39,7 +39,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.password.ChooseLockGeneric;
diff --git a/Settings/src/com/android/settings/security/SecurityAdvancedSettings.java b/Settings/src/com/android/settings/security/SecurityAdvancedSettings.java
index c29372ca..fa9befb2 100644
--- a/Settings/src/com/android/settings/security/SecurityAdvancedSettings.java
+++ b/Settings/src/com/android/settings/security/SecurityAdvancedSettings.java
@@ -22,7 +22,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
diff --git a/Settings/src/com/android/settings/security/SecurityAdvancedSettingsController.java b/Settings/src/com/android/settings/security/SecurityAdvancedSettingsController.java
index 22a482db..f4338c4c 100644
--- a/Settings/src/com/android/settings/security/SecurityAdvancedSettingsController.java
+++ b/Settings/src/com/android/settings/security/SecurityAdvancedSettingsController.java
@@ -22,7 +22,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.CrossProfileApps;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/security/SecuritySettings.java b/Settings/src/com/android/settings/security/SecuritySettings.java
index 6d987f34..6b2d762e 100644
--- a/Settings/src/com/android/settings/security/SecuritySettings.java
+++ b/Settings/src/com/android/settings/security/SecuritySettings.java
@@ -19,7 +19,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.combination.CombinedBiometricStatusPreferenceController;
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
diff --git a/Settings/src/com/android/settings/security/ShowPasswordPreferenceController.java b/Settings/src/com/android/settings/security/ShowPasswordPreferenceController.java
index a6e4db61..662f6a2c 100644
--- a/Settings/src/com/android/settings/security/ShowPasswordPreferenceController.java
+++ b/Settings/src/com/android/settings/security/ShowPasswordPreferenceController.java
@@ -19,7 +19,7 @@ package com.android.settings.security;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class ShowPasswordPreferenceController extends TogglePreferenceController {
diff --git a/Settings/src/com/android/settings/security/UnificationConfirmationDialog.java b/Settings/src/com/android/settings/security/UnificationConfirmationDialog.java
index 0238b0c5..f102bd6c 100644
--- a/Settings/src/com/android/settings/security/UnificationConfirmationDialog.java
+++ b/Settings/src/com/android/settings/security/UnificationConfirmationDialog.java
@@ -28,7 +28,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class UnificationConfirmationDialog extends InstrumentedDialogFragment {
diff --git a/Settings/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java b/Settings/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
index 0a6c3985..a14c027a 100644
--- a/Settings/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
+++ b/Settings/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
@@ -26,7 +26,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/Settings/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
index 3d64ca8c..e3164410 100644
--- a/Settings/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
+++ b/Settings/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
@@ -28,7 +28,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java b/Settings/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java
index a41a0b2f..a6026249 100644
--- a/Settings/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java
+++ b/Settings/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java
@@ -24,7 +24,7 @@ import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/Settings/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
index dd99e9f1..aefc916f 100644
--- a/Settings/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
+++ b/Settings/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
@@ -29,7 +29,7 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.display.TimeoutListPreference;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/Settings/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
index 9836a247..f5e3d3d5 100644
--- a/Settings/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
+++ b/Settings/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
@@ -24,7 +24,7 @@ import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.trustagent.TrustAgentManager;
diff --git a/Settings/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/Settings/src/com/android/settings/security/screenlock/ScreenLockSettings.java
index 1c66b711..98d8d440 100644
--- a/Settings/src/com/android/settings/security/screenlock/ScreenLockSettings.java
+++ b/Settings/src/com/android/settings/security/screenlock/ScreenLockSettings.java
@@ -25,7 +25,7 @@ import android.os.UserHandle;
import androidx.annotation.Nullable;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.OwnerInfoPreferenceController;
diff --git a/Settings/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/Settings/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
index 82b25ef3..393bed74 100644
--- a/Settings/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
+++ b/Settings/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
@@ -22,7 +22,7 @@ import android.os.UserHandle;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.SecurityFeatureProvider;
diff --git a/Settings/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/Settings/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
index 2ec90de9..7d959bfe 100644
--- a/Settings/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
+++ b/Settings/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SettingsBaseActivity;
diff --git a/Settings/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/Settings/src/com/android/settings/security/trustagent/TrustAgentSettings.java
index 72898248..5cee5e2e 100644
--- a/Settings/src/com/android/settings/security/trustagent/TrustAgentSettings.java
+++ b/Settings/src/com/android/settings/security/trustagent/TrustAgentSettings.java
@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
diff --git a/Settings/src/com/android/settings/shortcut/CreateShortcut.java b/Settings/src/com/android/settings/shortcut/CreateShortcut.java
index 392685f5..4963df8b 100644
--- a/Settings/src/com/android/settings/shortcut/CreateShortcut.java
+++ b/Settings/src/com/android/settings/shortcut/CreateShortcut.java
@@ -22,7 +22,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
/**
diff --git a/Settings/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java b/Settings/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
index 8f74bd9e..b99da3d4 100644
--- a/Settings/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
+++ b/Settings/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
@@ -43,7 +43,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.Settings.DataUsageSummaryActivity;
import com.android.settings.Settings.TetherSettingsActivity;
diff --git a/Settings/src/com/android/settings/sim/ChooseSimActivity.java b/Settings/src/com/android/settings/sim/ChooseSimActivity.java
index 9a75b63c..2d9db9b9 100644
--- a/Settings/src/com/android/settings/sim/ChooseSimActivity.java
+++ b/Settings/src/com/android/settings/sim/ChooseSimActivity.java
@@ -28,7 +28,7 @@ import android.util.Log;
import android.view.View;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SidecarFragment;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
diff --git a/Settings/src/com/android/settings/sim/DsdsDialogActivity.java b/Settings/src/com/android/settings/sim/DsdsDialogActivity.java
index 7d9a43bc..95e54382 100644
--- a/Settings/src/com/android/settings/sim/DsdsDialogActivity.java
+++ b/Settings/src/com/android/settings/sim/DsdsDialogActivity.java
@@ -21,7 +21,7 @@ import android.os.Bundle;
import android.telephony.TelephonyManager;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SidecarFragment;
import com.android.settings.network.EnableMultiSimSidecar;
import com.android.settings.network.telephony.ConfirmDialogFragment;
diff --git a/Settings/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java b/Settings/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java
index bd6a394f..4b1b7552 100644
--- a/Settings/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java
+++ b/Settings/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java
@@ -36,7 +36,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import java.util.List;
diff --git a/Settings/src/com/android/settings/sim/PreferredSimDialogFragment.java b/Settings/src/com/android/settings/sim/PreferredSimDialogFragment.java
index bb694406..39bfb4af 100644
--- a/Settings/src/com/android/settings/sim/PreferredSimDialogFragment.java
+++ b/Settings/src/com/android/settings/sim/PreferredSimDialogFragment.java
@@ -33,7 +33,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
/**
diff --git a/Settings/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java b/Settings/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
index b0b65f66..842862ed 100644
--- a/Settings/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
+++ b/Settings/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
@@ -36,7 +36,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import java.util.List;
diff --git a/Settings/src/com/android/settings/sim/SimActivationNotifier.java b/Settings/src/com/android/settings/sim/SimActivationNotifier.java
index c90836e5..63a0bd1f 100644
--- a/Settings/src/com/android/settings/sim/SimActivationNotifier.java
+++ b/Settings/src/com/android/settings/sim/SimActivationNotifier.java
@@ -35,7 +35,7 @@ import android.util.Log;
import androidx.core.app.TaskStackBuilder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/sim/SimDialogActivity.java b/Settings/src/com/android/settings/sim/SimDialogActivity.java
index 8840994b..2ac8588c 100644
--- a/Settings/src/com/android/settings/sim/SimDialogActivity.java
+++ b/Settings/src/com/android/settings/sim/SimDialogActivity.java
@@ -40,7 +40,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.network.CarrierConfigCache;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/sim/SimListDialogFragment.java b/Settings/src/com/android/settings/sim/SimListDialogFragment.java
index fd44dc74..10813a3d 100644
--- a/Settings/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/Settings/src/com/android/settings/sim/SimListDialogFragment.java
@@ -40,7 +40,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/sim/SimNotificationService.java b/Settings/src/com/android/settings/sim/SimNotificationService.java
index 42b5e58c..d8172010 100644
--- a/Settings/src/com/android/settings/sim/SimNotificationService.java
+++ b/Settings/src/com/android/settings/sim/SimNotificationService.java
@@ -25,7 +25,7 @@ import android.content.Context;
import android.os.PersistableBundle;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** A JobService sends SIM notifications. */
public class SimNotificationService extends JobService {
diff --git a/Settings/src/com/android/settings/sim/SimSelectNotification.java b/Settings/src/com/android/settings/sim/SimSelectNotification.java
index 9b235cea..d8d0b0cc 100644
--- a/Settings/src/com/android/settings/sim/SimSelectNotification.java
+++ b/Settings/src/com/android/settings/sim/SimSelectNotification.java
@@ -51,7 +51,7 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.HelpTrampoline;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
public class SimSelectNotification extends BroadcastReceiver {
diff --git a/Settings/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java b/Settings/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java
index db6e1b44..eba69066 100644
--- a/Settings/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java
+++ b/Settings/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java
@@ -20,7 +20,7 @@ import android.os.Bundle;
import android.telephony.SubscriptionInfo;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SidecarFragment;
import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
import com.android.settings.network.UiccSlotUtil;
diff --git a/Settings/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java b/Settings/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
index af8b38c5..641665bf 100644
--- a/Settings/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
+++ b/Settings/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
diff --git a/Settings/src/com/android/settings/sim/receivers/SimSlotChangeService.kt b/Settings/src/com/android/settings/sim/receivers/SimSlotChangeService.kt
index 7ecb4830..1ee7ccac 100644
--- a/Settings/src/com/android/settings/sim/receivers/SimSlotChangeService.kt
+++ b/Settings/src/com/android/settings/sim/receivers/SimSlotChangeService.kt
@@ -22,7 +22,7 @@ import android.app.job.JobService
import android.content.ComponentName
import android.content.Context
import android.util.Log
-import com.android.settings.R
+import com.cariad.cea.settings.R
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
diff --git a/Settings/src/com/android/settings/sim/receivers/SuwFinishReceiver.java b/Settings/src/com/android/settings/sim/receivers/SuwFinishReceiver.java
index 7facbe25..ade98a15 100644
--- a/Settings/src/com/android/settings/sim/receivers/SuwFinishReceiver.java
+++ b/Settings/src/com/android/settings/sim/receivers/SuwFinishReceiver.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.Intent;
import android.util.Log;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.ThreadUtils;
/** The receiver when SUW is finished. */
diff --git a/Settings/src/com/android/settings/sim/smartForwarding/MDNHandlerFragment.java b/Settings/src/com/android/settings/sim/smartForwarding/MDNHandlerFragment.java
index cada66aa..b212da3e 100644
--- a/Settings/src/com/android/settings/sim/smartForwarding/MDNHandlerFragment.java
+++ b/Settings/src/com/android/settings/sim/smartForwarding/MDNHandlerFragment.java
@@ -31,7 +31,7 @@ import android.widget.Button;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.instrumentation.Instrumentable;
public class MDNHandlerFragment extends Fragment implements Instrumentable {
diff --git a/Settings/src/com/android/settings/sim/smartForwarding/MDNHandlerHeaderFragment.java b/Settings/src/com/android/settings/sim/smartForwarding/MDNHandlerHeaderFragment.java
index 5fd8049d..428c1570 100644
--- a/Settings/src/com/android/settings/sim/smartForwarding/MDNHandlerHeaderFragment.java
+++ b/Settings/src/com/android/settings/sim/smartForwarding/MDNHandlerHeaderFragment.java
@@ -29,7 +29,7 @@ import androidx.preference.EditTextPreference.OnBindEditTextListener;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.instrumentation.Instrumentable;
public class MDNHandlerHeaderFragment extends PreferenceFragmentCompat
diff --git a/Settings/src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java b/Settings/src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java
index 95ac9992..1c916fe8 100644
--- a/Settings/src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java
+++ b/Settings/src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java
@@ -36,7 +36,7 @@ import android.widget.Toolbar;
import androidx.core.content.ContextCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/sim/smartForwarding/SmartForwardingFragment.java b/Settings/src/com/android/settings/sim/smartForwarding/SmartForwardingFragment.java
index a95eb38e..02451480 100644
--- a/Settings/src/com/android/settings/sim/smartForwarding/SmartForwardingFragment.java
+++ b/Settings/src/com/android/settings/sim/smartForwarding/SmartForwardingFragment.java
@@ -29,7 +29,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.instrumentation.Instrumentable;
public class SmartForwardingFragment extends PreferenceFragmentCompat
diff --git a/Settings/src/com/android/settings/slices/SettingsSliceProvider.java b/Settings/src/com/android/settings/slices/SettingsSliceProvider.java
index ec60f441..7c9757c3 100644
--- a/Settings/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/Settings/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -46,7 +46,7 @@ import androidx.collection.ArraySet;
import androidx.slice.Slice;
import androidx.slice.SliceProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.bluetooth.BluetoothSliceBuilder;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/slices/SliceBuilderUtils.java b/Settings/src/com/android/settings/slices/SliceBuilderUtils.java
index c9d5f23f..32721e47 100644
--- a/Settings/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/Settings/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -43,7 +43,7 @@ import androidx.slice.builders.ListBuilder.InputRangeBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/slices/SliceDataConverter.java b/Settings/src/com/android/settings/slices/SliceDataConverter.java
index f6828af3..8da7d236 100644
--- a/Settings/src/com/android/settings/slices/SliceDataConverter.java
+++ b/Settings/src/com/android/settings/slices/SliceDataConverter.java
@@ -46,7 +46,7 @@ import android.view.accessibility.AccessibilityManager;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.accessibility.AccessibilitySlicePreferenceController;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/slices/SlicePreference.java b/Settings/src/com/android/settings/slices/SlicePreference.java
index fe5ed607..a2c5d2a9 100644
--- a/Settings/src/com/android/settings/slices/SlicePreference.java
+++ b/Settings/src/com/android/settings/slices/SlicePreference.java
@@ -23,7 +23,7 @@ import android.view.View;
import androidx.slice.Slice;
import androidx.slice.widget.SliceView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.LayoutPreference;
/**
diff --git a/Settings/src/com/android/settings/slices/Sliceable.java b/Settings/src/com/android/settings/slices/Sliceable.java
index f09afc43..4f4727b2 100644
--- a/Settings/src/com/android/settings/slices/Sliceable.java
+++ b/Settings/src/com/android/settings/slices/Sliceable.java
@@ -28,7 +28,7 @@ import android.widget.Toast;
import androidx.annotation.StringRes;
import androidx.slice.Slice;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A collection of API making a PreferenceController "sliceable"
diff --git a/Settings/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/Settings/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index 35cc65fa..db80f171 100644
--- a/Settings/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/Settings/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -25,7 +25,7 @@ import android.text.TextUtils;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.bluetooth.HeadsetProfile;
import com.android.settingslib.bluetooth.HearingAidProfile;
diff --git a/Settings/src/com/android/settings/sound/MediaControlsLockScreenPreferenceController.java b/Settings/src/com/android/settings/sound/MediaControlsLockScreenPreferenceController.java
index 009ab2e4..5489480a 100644
--- a/Settings/src/com/android/settings/sound/MediaControlsLockScreenPreferenceController.java
+++ b/Settings/src/com/android/settings/sound/MediaControlsLockScreenPreferenceController.java
@@ -21,7 +21,7 @@ import static android.provider.Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/sound/MediaControlsParentPreferenceController.java b/Settings/src/com/android/settings/sound/MediaControlsParentPreferenceController.java
index acdfb56f..1d763416 100644
--- a/Settings/src/com/android/settings/sound/MediaControlsParentPreferenceController.java
+++ b/Settings/src/com/android/settings/sound/MediaControlsParentPreferenceController.java
@@ -21,7 +21,7 @@ import static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/sound/MediaControlsPreferenceController.java b/Settings/src/com/android/settings/sound/MediaControlsPreferenceController.java
index e180b34f..35a9f9b5 100644
--- a/Settings/src/com/android/settings/sound/MediaControlsPreferenceController.java
+++ b/Settings/src/com/android/settings/sound/MediaControlsPreferenceController.java
@@ -23,7 +23,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/sound/MediaControlsRecommendationController.java b/Settings/src/com/android/settings/sound/MediaControlsRecommendationController.java
index 842a1417..35fa8921 100644
--- a/Settings/src/com/android/settings/sound/MediaControlsRecommendationController.java
+++ b/Settings/src/com/android/settings/sound/MediaControlsRecommendationController.java
@@ -21,7 +21,7 @@ import static android.provider.Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/sound/MediaControlsSettings.java b/Settings/src/com/android/settings/sound/MediaControlsSettings.java
index f914b5d6..9a2c1a2f 100644
--- a/Settings/src/com/android/settings/sound/MediaControlsSettings.java
+++ b/Settings/src/com/android/settings/sound/MediaControlsSettings.java
@@ -18,7 +18,7 @@ package com.android.settings.sound;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/sound/MediaOutputPreferenceController.java b/Settings/src/com/android/settings/sound/MediaOutputPreferenceController.java
index c85789db..966c9a8a 100644
--- a/Settings/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/Settings/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.media.MediaOutputUtils;
import com.android.settingslib.Utils;
import com.android.settingslib.bluetooth.A2dpProfile;
diff --git a/Settings/src/com/android/settings/spa/about/AboutPhone.kt b/Settings/src/com/android/settings/spa/about/AboutPhone.kt
index 5f9aa976..0042517e 100644
--- a/Settings/src/com/android/settings/spa/about/AboutPhone.kt
+++ b/Settings/src/com/android/settings/spa/about/AboutPhone.kt
@@ -23,7 +23,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
diff --git a/Settings/src/com/android/settings/spa/about/BasicInfoCategory.kt b/Settings/src/com/android/settings/spa/about/BasicInfoCategory.kt
index d382f51b..5ddd6d98 100644
--- a/Settings/src/com/android/settings/spa/about/BasicInfoCategory.kt
+++ b/Settings/src/com/android/settings/spa/about/BasicInfoCategory.kt
@@ -18,7 +18,7 @@ package com.android.settings.spa.about
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.ui.Category
object BasicInfoCategory {
diff --git a/Settings/src/com/android/settings/spa/about/DeviceName.kt b/Settings/src/com/android/settings/spa/about/DeviceName.kt
index 86a95127..869ccff1 100644
--- a/Settings/src/com/android/settings/spa/about/DeviceName.kt
+++ b/Settings/src/com/android/settings/spa/about/DeviceName.kt
@@ -22,7 +22,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.deviceinfo.DeviceNamePreferenceController
import com.android.settingslib.spa.widget.dialog.AlertDialogButton
import com.android.settingslib.spa.widget.dialog.rememberAlertDialogPresenter
diff --git a/Settings/src/com/android/settings/spa/app/AllAppList.kt b/Settings/src/com/android/settings/spa/app/AllAppList.kt
index 5e0ac951..bf90ff9e 100644
--- a/Settings/src/com/android/settings/spa/app/AllAppList.kt
+++ b/Settings/src/com/android/settings/spa/app/AllAppList.kt
@@ -22,7 +22,7 @@ import android.os.Bundle
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPageProvider
diff --git a/Settings/src/com/android/settings/spa/app/AppsMain.kt b/Settings/src/com/android/settings/spa/app/AppsMain.kt
index 83b3080a..015bfb8c 100644
--- a/Settings/src/com/android/settings/spa/app/AppsMain.kt
+++ b/Settings/src/com/android/settings/spa/app/AppsMain.kt
@@ -21,7 +21,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Apps
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.spa.app.backgroundinstall.BackgroundInstalledAppsPageProvider
import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider
import com.android.settingslib.spa.framework.common.SettingsEntry
diff --git a/Settings/src/com/android/settings/spa/app/ResetAppPreferences.kt b/Settings/src/com/android/settings/spa/app/ResetAppPreferences.kt
index 34c4145e..68037134 100644
--- a/Settings/src/com/android/settings/spa/app/ResetAppPreferences.kt
+++ b/Settings/src/com/android/settings/spa/app/ResetAppPreferences.kt
@@ -22,7 +22,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.manageapplications.ResetAppsHelper
import com.android.settingslib.spa.widget.dialog.AlertDialogButton
import com.android.settingslib.spa.widget.dialog.AlertDialogPresenter
diff --git a/Settings/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt b/Settings/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt
index 1e6e5459..14c7bed4 100644
--- a/Settings/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.appcompat.UserAspectRatioDetails
import com.android.settings.applications.appcompat.UserAspectRatioManager
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
diff --git a/Settings/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/Settings/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
index 15cd1bab..9c9224d8 100644
--- a/Settings/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
+++ b/Settings/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
@@ -35,7 +35,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.appcompat.UserAspectRatioManager
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPageProvider
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppAllServicesPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppAllServicesPreference.kt
index 31e068cb..cf94094b 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppAllServicesPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppAllServicesPreference.kt
@@ -30,7 +30,7 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spaprivileged.model.app.resolveActionForApp
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppArchiveButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppArchiveButton.kt
index 38a84998..488e1a2c 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppArchiveButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppArchiveButton.kt
@@ -29,7 +29,7 @@ import androidx.compose.material.icons.outlined.CloudUpload
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.button.ActionButton
import com.android.settingslib.spaprivileged.framework.compose.DisposableBroadcastReceiverAsUser
import kotlinx.coroutines.Dispatchers
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
index af4fc176..a578002f 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.res.stringResource
import androidx.core.os.bundleOf
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.core.SubSettingLauncher
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppClearButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppClearButton.kt
index 22a93c1d..cab66e69 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppClearButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppClearButton.kt
@@ -22,7 +22,7 @@ import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.button.ActionButton
import com.android.settingslib.spa.widget.dialog.AlertDialogButton
import com.android.settingslib.spa.widget.dialog.rememberAlertDialogPresenter
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppCreateButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppCreateButton.kt
index c9ad4229..b4d28dfe 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppCreateButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppCreateButton.kt
@@ -24,7 +24,7 @@ import androidx.compose.material.icons.outlined.Add
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.rememberCoroutineScope
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.manageapplications.CloneBackend
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider.getRoute
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt
index 7e6e7261..60600aa5 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt
@@ -26,7 +26,7 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.datausage.AppDataUsage
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
index 555e9f14..43c36828 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
@@ -23,7 +23,7 @@ import androidx.compose.material.icons.outlined.HideSource
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spa.widget.button.ActionButton
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
index c3183a74..08f85c3a 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
@@ -27,7 +27,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.RestrictedLockUtils
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin
import com.android.settingslib.RestrictedLockUtilsInternal
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
index c12915c6..568f7554 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
@@ -31,7 +31,7 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavType
import androidx.navigation.navArgument
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.AppInfoBase
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.flags.Flags
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
index 1ed59590..905b1713 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
@@ -31,7 +31,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settingslib.spa.widget.scaffold.MoreOptionsAction
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppInstallButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
index caf6a4d4..9560ef7e 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
@@ -20,7 +20,7 @@ import android.content.Intent
import android.content.pm.ApplicationInfo
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.FileDownload
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.AppStoreUtil
import com.android.settingslib.spa.widget.button.ActionButton
import com.android.settingslib.spaprivileged.model.app.userHandle
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreference.kt
index 62e714a6..e93164be 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreference.kt
@@ -25,7 +25,7 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.applications.AppStoreUtil
import com.android.settingslib.applications.AppUtils
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
index c7eb02df..dab42ab8 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
@@ -21,7 +21,7 @@ import android.content.Intent
import android.content.pm.ApplicationInfo
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Launch
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.button.ActionButton
import com.android.settingslib.spaprivileged.model.app.userHandle
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppLocalePreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppLocalePreference.kt
index 3b2aace6..74950afe 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppLocalePreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppLocalePreference.kt
@@ -28,7 +28,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.AppInfoBase
import com.android.settings.applications.AppLocaleUtil
import com.android.settings.applications.appinfo.AppLocaleDetails
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppNotificationPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppNotificationPreference.kt
index 28527c1b..5379ac32 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppNotificationPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppNotificationPreference.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.notification.app.AppNotificationSettings
import com.android.settings.spa.notification.AppNotificationRepository
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreference.kt
index aae9569b..583352fc 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreference.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.applications.intentpicker.AppLaunchSettings
import com.android.settings.applications.intentpicker.IntentPickerUtils
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt
index 1274eea7..a463a32c 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt
@@ -25,7 +25,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spaprivileged.framework.compose.placeholder
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt
index d0bdd6b3..8ba50cdc 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt
@@ -22,7 +22,7 @@ import android.icu.text.ListFormatter
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.applications.PermissionsSummaryHelper
import com.android.settingslib.spa.framework.util.formatString
import com.android.settingslib.spaprivileged.framework.common.asUser
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppRestoreButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppRestoreButton.kt
index bf46e958..358e3d68 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppRestoreButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppRestoreButton.kt
@@ -29,7 +29,7 @@ import androidx.compose.material.icons.outlined.CloudDownload
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.button.ActionButton
import com.android.settingslib.spaprivileged.framework.compose.DisposableBroadcastReceiverAsUser
import kotlinx.coroutines.CoroutineScope
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppSettingsPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppSettingsPreference.kt
index c2bee59a..30f420af 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppSettingsPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppSettingsPreference.kt
@@ -26,7 +26,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spa.widget.preference.Preference
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppStoragePreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppStoragePreference.kt
index 2b96454c..40599620 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppStoragePreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppStoragePreference.kt
@@ -21,7 +21,7 @@ import android.content.pm.ApplicationInfo
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.AppStorageSettings
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settingslib.spa.widget.preference.Preference
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreference.kt
index 837df67a..db0fed3e 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreference.kt
@@ -28,7 +28,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.liveData
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
index ce728408..f2434b38 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
@@ -26,7 +26,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.vectorResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd
import com.android.settingslib.spa.widget.button.ActionButton
import com.android.settingslib.spaprivileged.model.app.isActiveAdmin
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/CloneAppInfoSettings.kt b/Settings/src/com/android/settings/spa/app/appinfo/CloneAppInfoSettings.kt
index c8e8d35d..d53310fc 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/CloneAppInfoSettings.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/CloneAppInfoSettings.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavType
import androidx.navigation.navArgument
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.widget.scaffold.RegularScaffold
import com.android.settingslib.spaprivileged.model.app.toRoute
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt b/Settings/src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt
index ddc7e178..4bdfd82d 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt
@@ -23,7 +23,7 @@ import androidx.compose.material.icons.outlined.WarningAmber
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.button.ActionButton
import com.android.settingslib.spa.widget.button.ActionButtons
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreference.kt
index 51f68457..6bc0ab9f 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreference.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.liveData
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spaprivileged.framework.common.userManager
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/DefaultAppShortcuts.kt b/Settings/src/com/android/settings/spa/app/appinfo/DefaultAppShortcuts.kt
index 9674f7d9..f7e5e9d6 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/DefaultAppShortcuts.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/DefaultAppShortcuts.kt
@@ -19,7 +19,7 @@ package com.android.settings.spa.app.appinfo
import android.app.role.RoleManager
import android.content.pm.ApplicationInfo
import androidx.compose.runtime.Composable
-import com.android.settings.R
+import com.cariad.cea.settings.R
@Composable
fun DefaultAppShortcuts(app: ApplicationInfo) {
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt
index 86d7f445..f43da9c6 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt
@@ -34,7 +34,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils.PROPERTY_APP_HIBERNATION_ENABLED
import com.android.settings.Utils.PROPERTY_HIBERNATION_TARGETS_PRE_S_APPS
import com.android.settings.flags.Flags
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreference.kt
index 9c3ec97e..d026192a 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreference.kt
@@ -33,7 +33,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settingslib.spa.framework.theme.SettingsDimension
import com.android.settingslib.spa.widget.preference.Preference
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreference.kt b/Settings/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreference.kt
index 905e0575..da02d795 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreference.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreference.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetails
import com.android.settingslib.spa.widget.preference.Preference
diff --git a/Settings/src/com/android/settings/spa/app/appinfo/TopBarAppLaunchButton.kt b/Settings/src/com/android/settings/spa/app/appinfo/TopBarAppLaunchButton.kt
index 92ad1398..fff17ded 100644
--- a/Settings/src/com/android/settings/spa/app/appinfo/TopBarAppLaunchButton.kt
+++ b/Settings/src/com/android/settings/spa/app/appinfo/TopBarAppLaunchButton.kt
@@ -25,7 +25,7 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.model.app.userHandle
@Composable
diff --git a/Settings/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProvider.kt b/Settings/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProvider.kt
index 89f473b5..418b8104 100644
--- a/Settings/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProvider.kt
+++ b/Settings/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProvider.kt
@@ -37,7 +37,7 @@ import androidx.compose.runtime.produceState
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
import com.android.settings.spa.app.startUninstallActivity
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
diff --git a/Settings/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt b/Settings/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
index f077506b..53aeed87 100644
--- a/Settings/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
+++ b/Settings/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
@@ -23,7 +23,7 @@ import android.os.Bundle
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import androidx.core.os.bundleOf
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.core.SubSettingLauncher
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/AllFilesAccess.kt b/Settings/src/com/android/settings/spa/app/specialaccess/AllFilesAccess.kt
index d82045d1..bbfe89f7 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/AllFilesAccess.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/AllFilesAccess.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/BackupTasksApps.kt b/Settings/src/com/android/settings/spa/app/specialaccess/BackupTasksApps.kt
index d6d8fd4a..9f9cb5da 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/BackupTasksApps.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/BackupTasksApps.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/DisplayOverOtherApps.kt b/Settings/src/com/android/settings/spa/app/specialaccess/DisplayOverOtherApps.kt
index 26d74518..6d4978d8 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/DisplayOverOtherApps.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/DisplayOverOtherApps.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt b/Settings/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
index 3e9058f2..19ff0fb8 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
@@ -25,7 +25,7 @@ import android.content.Context
import android.content.pm.ApplicationInfo
import android.os.UserManager
import androidx.compose.runtime.Composable
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.lifecycle.collectAsCallbackWithLifecycle
import com.android.settingslib.spaprivileged.model.app.AppOpsController
import com.android.settingslib.spaprivileged.model.app.AppRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/LongBackgroundTasksApps.kt b/Settings/src/com/android/settings/spa/app/specialaccess/LongBackgroundTasksApps.kt
index 3ba9b085..182a616a 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/LongBackgroundTasksApps.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/LongBackgroundTasksApps.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/MediaManagementApps.kt b/Settings/src/com/android/settings/spa/app/specialaccess/MediaManagementApps.kt
index 3e3457c2..cc969185 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/MediaManagementApps.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/MediaManagementApps.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/MediaRoutingControl.kt b/Settings/src/com/android/settings/spa/app/specialaccess/MediaRoutingControl.kt
index b9fb9b8c..671e2127 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/MediaRoutingControl.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/MediaRoutingControl.kt
@@ -23,7 +23,7 @@ import android.app.settings.SettingsEnums
import android.companion.AssociationRequest
import android.content.Context
import com.android.media.flags.Flags;
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/ModifySystemSettings.kt b/Settings/src/com/android/settings/spa/app/specialaccess/ModifySystemSettings.kt
index 4ab7f52c..9f4953d7 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/ModifySystemSettings.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/ModifySystemSettings.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/NfcTagAppsSettings.kt b/Settings/src/com/android/settings/spa/app/specialaccess/NfcTagAppsSettings.kt
index f02a6a11..db3c4e50 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/NfcTagAppsSettings.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/NfcTagAppsSettings.kt
@@ -23,7 +23,7 @@ import android.content.pm.PackageManager.PackageInfoFlags
import android.nfc.NfcAdapter
import android.util.Log
import androidx.compose.runtime.Composable
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.livedata.observeAsCallback
import com.android.settingslib.spaprivileged.model.app.AppRecord
import com.android.settingslib.spaprivileged.model.app.userId
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt b/Settings/src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt
index 7885b869..718d6e9a 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt
@@ -26,7 +26,7 @@ import android.content.pm.PackageManager.GET_ACTIVITIES
import android.content.pm.PackageManager.PackageInfoFlags
import android.util.Log
import androidx.compose.runtime.Composable
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.lifecycle.collectAsCallbackWithLifecycle
import com.android.settingslib.spaprivileged.model.app.AppOpsController
import com.android.settingslib.spaprivileged.model.app.AppRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt b/Settings/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
index 4f791731..f65a9232 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
@@ -19,7 +19,7 @@ package com.android.settings.spa.app.specialaccess
import android.os.Bundle
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsEntry
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPageProvider
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/TurnScreenOnApps.kt b/Settings/src/com/android/settings/spa/app/specialaccess/TurnScreenOnApps.kt
index 262acb78..7ed64cea 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/TurnScreenOnApps.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/TurnScreenOnApps.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/UseFullScreenIntent.kt b/Settings/src/com/android/settings/spa/app/specialaccess/UseFullScreenIntent.kt
index 514e4802..79b80bb8 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/UseFullScreenIntent.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/UseFullScreenIntent.kt
@@ -19,7 +19,7 @@ package com.android.settings.spa.app.specialaccess
import android.Manifest
import android.app.AppOpsManager
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListProvider
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/VoiceActivationApps.kt b/Settings/src/com/android/settings/spa/app/specialaccess/VoiceActivationApps.kt
index 12258068..05f54d0d 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/VoiceActivationApps.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/VoiceActivationApps.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory
import com.android.settingslib.spaprivileged.model.app.PackageManagers.hasGrantPermission
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
diff --git a/Settings/src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt b/Settings/src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt
index 50bb5c9b..ee60fc3a 100644
--- a/Settings/src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt
+++ b/Settings/src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt
@@ -20,7 +20,7 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.AppOpsManager.MODE_IGNORED
import android.content.Context
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.model.app.IPackageManagers
import com.android.settingslib.spaprivileged.model.app.PackageManagers
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
diff --git a/Settings/src/com/android/settings/spa/app/storage/StorageAppList.kt b/Settings/src/com/android/settings/spa/app/storage/StorageAppList.kt
index c33de33d..841ba0b5 100644
--- a/Settings/src/com/android/settings/spa/app/storage/StorageAppList.kt
+++ b/Settings/src/com/android/settings/spa/app/storage/StorageAppList.kt
@@ -26,7 +26,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.util.filterItem
diff --git a/Settings/src/com/android/settings/spa/development/UsageStats.kt b/Settings/src/com/android/settings/spa/development/UsageStats.kt
index 4d9c4551..aa04b9c6 100644
--- a/Settings/src/com/android/settings/spa/development/UsageStats.kt
+++ b/Settings/src/com/android/settings/spa/development/UsageStats.kt
@@ -19,7 +19,7 @@ package com.android.settings.spa.development
import android.os.Bundle
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.compose.rememberContext
import com.android.settingslib.spaprivileged.template.app.AppListPage
diff --git a/Settings/src/com/android/settings/spa/development/UsageStatsListModel.kt b/Settings/src/com/android/settings/spa/development/UsageStatsListModel.kt
index bb20da6b..e3a76eec 100644
--- a/Settings/src/com/android/settings/spa/development/UsageStatsListModel.kt
+++ b/Settings/src/com/android/settings/spa/development/UsageStatsListModel.kt
@@ -22,7 +22,7 @@ import android.content.Context
import android.content.pm.ApplicationInfo
import android.text.format.DateUtils
import androidx.compose.runtime.Composable
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.spa.development.UsageStatsListModel.SpinnerItem.Companion.toSpinnerItem
import com.android.settingslib.spa.widget.ui.SpinnerOption
import com.android.settingslib.spaprivileged.model.app.AppEntry
diff --git a/Settings/src/com/android/settings/spa/development/compat/PlatformCompatAppList.kt b/Settings/src/com/android/settings/spa/development/compat/PlatformCompatAppList.kt
index 5f3b4e70..a443742c 100644
--- a/Settings/src/com/android/settings/spa/development/compat/PlatformCompatAppList.kt
+++ b/Settings/src/com/android/settings/spa/development/compat/PlatformCompatAppList.kt
@@ -19,7 +19,7 @@ package com.android.settings.spa.development.compat
import android.os.Bundle
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.compose.rememberContext
import com.android.settingslib.spaprivileged.template.app.AppListPage
diff --git a/Settings/src/com/android/settings/spa/home/HomePage.kt b/Settings/src/com/android/settings/spa/home/HomePage.kt
index bb016d57..3248ea78 100644
--- a/Settings/src/com/android/settings/spa/home/HomePage.kt
+++ b/Settings/src/com/android/settings/spa/home/HomePage.kt
@@ -17,7 +17,7 @@
package com.android.settings.spa.home
import android.os.Bundle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.spa.about.AboutPhonePageProvider
import com.android.settings.spa.app.AppsMainPageProvider
import com.android.settings.spa.network.NetworkAndInternetPageProvider
diff --git a/Settings/src/com/android/settings/spa/network/AirplaneModePreference.kt b/Settings/src/com/android/settings/spa/network/AirplaneModePreference.kt
index 27261b6b..1e048063 100644
--- a/Settings/src/com/android/settings/spa/network/AirplaneModePreference.kt
+++ b/Settings/src/com/android/settings/spa/network/AirplaneModePreference.kt
@@ -28,7 +28,7 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import com.android.settings.AirplaneModeEnabler
import com.android.settings.AirplaneModeEnabler.OnAirplaneModeChangedListener
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.preference.SwitchPreference
import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
import com.android.settingslib.spa.widget.ui.SettingsIcon
diff --git a/Settings/src/com/android/settings/spa/network/NetworkAndInternet.kt b/Settings/src/com/android/settings/spa/network/NetworkAndInternet.kt
index f9852371..f81538ba 100644
--- a/Settings/src/com/android/settings/spa/network/NetworkAndInternet.kt
+++ b/Settings/src/com/android/settings/spa/network/NetworkAndInternet.kt
@@ -26,7 +26,7 @@ import androidx.compose.material.icons.outlined.Wifi
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.RestrictedLockUtilsInternal
import com.android.settingslib.Utils
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
diff --git a/Settings/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt b/Settings/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
index a0c363a2..71f325f0 100644
--- a/Settings/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
+++ b/Settings/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
@@ -41,7 +41,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SubscriptionInfoListViewModel
import com.android.settings.network.telephony.MobileNetworkUtils
import com.android.settings.wifi.WifiPickerTrackerHelper
diff --git a/Settings/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt b/Settings/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt
index 3b2d5ec0..14070baa 100644
--- a/Settings/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt
+++ b/Settings/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt
@@ -29,7 +29,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SimOnboardingService
import com.android.settingslib.spa.framework.theme.SettingsDimension
import com.android.settingslib.spa.widget.dialog.AlertDialogButton
diff --git a/Settings/src/com/android/settings/spa/network/SimOnboardingPageProvider.kt b/Settings/src/com/android/settings/spa/network/SimOnboardingPageProvider.kt
index 838154fa..974810f6 100644
--- a/Settings/src/com/android/settings/spa/network/SimOnboardingPageProvider.kt
+++ b/Settings/src/com/android/settings/spa/network/SimOnboardingPageProvider.kt
@@ -32,7 +32,7 @@ import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import androidx.navigation.navArgument
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SimOnboardingActivity
import com.android.settings.network.SimOnboardingActivity.Companion.CallbackType
import com.android.settings.network.SimOnboardingService
diff --git a/Settings/src/com/android/settings/spa/network/SimOnboardingPrimarySim.kt b/Settings/src/com/android/settings/spa/network/SimOnboardingPrimarySim.kt
index b9849666..9d4e4884 100644
--- a/Settings/src/com/android/settings/spa/network/SimOnboardingPrimarySim.kt
+++ b/Settings/src/com/android/settings/spa/network/SimOnboardingPrimarySim.kt
@@ -28,7 +28,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SimOnboardingService
import com.android.settingslib.spa.framework.theme.SettingsDimension
import com.android.settingslib.spa.widget.preference.ListPreference
diff --git a/Settings/src/com/android/settings/spa/network/SimOnboardingSelectSim.kt b/Settings/src/com/android/settings/spa/network/SimOnboardingSelectSim.kt
index 5e71b12e..db05c91f 100644
--- a/Settings/src/com/android/settings/spa/network/SimOnboardingSelectSim.kt
+++ b/Settings/src/com/android/settings/spa/network/SimOnboardingSelectSim.kt
@@ -27,7 +27,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SimOnboardingService
import com.android.settings.sim.SimDialogActivity
import com.android.settingslib.spa.framework.theme.SettingsDimension
diff --git a/Settings/src/com/android/settings/spa/network/SimsSection.kt b/Settings/src/com/android/settings/spa/network/SimsSection.kt
index 334ca61b..51fd3cee 100644
--- a/Settings/src/com/android/settings/spa/network/SimsSection.kt
+++ b/Settings/src/com/android/settings/spa/network/SimsSection.kt
@@ -29,7 +29,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SubscriptionUtil
import com.android.settings.network.telephony.MobileNetworkUtils
import com.android.settings.network.telephony.isSubscriptionEnabledFlow
diff --git a/Settings/src/com/android/settings/spa/notification/AppListNotifications.kt b/Settings/src/com/android/settings/spa/notification/AppListNotifications.kt
index 00e43949..71928a49 100644
--- a/Settings/src/com/android/settings/spa/notification/AppListNotifications.kt
+++ b/Settings/src/com/android/settings/spa/notification/AppListNotifications.kt
@@ -19,7 +19,7 @@ package com.android.settings.spa.notification
import android.os.Bundle
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.compose.navigator
import com.android.settingslib.spa.framework.compose.rememberContext
diff --git a/Settings/src/com/android/settings/spa/notification/AppNotificationRepository.kt b/Settings/src/com/android/settings/spa/notification/AppNotificationRepository.kt
index d0e700a9..e9a64a4b 100644
--- a/Settings/src/com/android/settings/spa/notification/AppNotificationRepository.kt
+++ b/Settings/src/com/android/settings/spa/notification/AppNotificationRepository.kt
@@ -31,7 +31,7 @@ import android.os.IUserManager
import android.os.RemoteException
import android.os.ServiceManager
import android.util.Log
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.util.formatString
import com.android.settingslib.spaprivileged.model.app.IPackageManagers
import com.android.settingslib.spaprivileged.model.app.PackageManagers
diff --git a/Settings/src/com/android/settings/spa/notification/AppNotificationsListModel.kt b/Settings/src/com/android/settings/spa/notification/AppNotificationsListModel.kt
index 9f949c43..d1a14b24 100644
--- a/Settings/src/com/android/settings/spa/notification/AppNotificationsListModel.kt
+++ b/Settings/src/com/android/settings/spa/notification/AppNotificationsListModel.kt
@@ -23,7 +23,7 @@ import android.icu.text.RelativeDateTimeFormatter
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.produceState
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.AppInfoBase
import com.android.settings.notification.app.AppNotificationSettings
import com.android.settings.spa.notification.SpinnerItem.Companion.toSpinnerItem
diff --git a/Settings/src/com/android/settings/spa/notification/NotificationMain.kt b/Settings/src/com/android/settings/spa/notification/NotificationMain.kt
index b3c7a554..ff0490bd 100644
--- a/Settings/src/com/android/settings/spa/notification/NotificationMain.kt
+++ b/Settings/src/com/android/settings/spa/notification/NotificationMain.kt
@@ -21,7 +21,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Notifications
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
diff --git a/Settings/src/com/android/settings/spa/preference/ComposePreference.kt b/Settings/src/com/android/settings/spa/preference/ComposePreference.kt
index aa5c32c3..ea08ecb6 100644
--- a/Settings/src/com/android/settings/spa/preference/ComposePreference.kt
+++ b/Settings/src/com/android/settings/spa/preference/ComposePreference.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.theme.SettingsTheme
open class ComposePreference @JvmOverloads constructor(
diff --git a/Settings/src/com/android/settings/spa/system/AppLanguages.kt b/Settings/src/com/android/settings/spa/system/AppLanguages.kt
index d836a32e..58eb4381 100644
--- a/Settings/src/com/android/settings/spa/system/AppLanguages.kt
+++ b/Settings/src/com/android/settings/spa/system/AppLanguages.kt
@@ -22,7 +22,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.compose.navigator
import com.android.settingslib.spa.framework.compose.rememberContext
diff --git a/Settings/src/com/android/settings/spa/system/AppLanguagesListModel.kt b/Settings/src/com/android/settings/spa/system/AppLanguagesListModel.kt
index 3573e257..70148301 100644
--- a/Settings/src/com/android/settings/spa/system/AppLanguagesListModel.kt
+++ b/Settings/src/com/android/settings/spa/system/AppLanguagesListModel.kt
@@ -27,7 +27,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.AppLocaleUtil
import com.android.settings.applications.appinfo.AppLocaleDetails
import com.android.settings.localepicker.AppLocalePickerActivity
diff --git a/Settings/src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt b/Settings/src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt
index 5c1038d6..4afaef03 100644
--- a/Settings/src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt
+++ b/Settings/src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt
@@ -21,7 +21,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Language
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.compose.navigator
import com.android.settingslib.spa.widget.preference.Preference
diff --git a/Settings/src/com/android/settings/spa/system/SystemMain.kt b/Settings/src/com/android/settings/spa/system/SystemMain.kt
index c9aa8cc0..78506fd3 100644
--- a/Settings/src/com/android/settings/spa/system/SystemMain.kt
+++ b/Settings/src/com/android/settings/spa/system/SystemMain.kt
@@ -21,7 +21,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Info
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
diff --git a/Settings/src/com/android/settings/support/SupportDashboardActivity.java b/Settings/src/com/android/settings/support/SupportDashboardActivity.java
index dc77dd4f..15e0a6a2 100644
--- a/Settings/src/com/android/settings/support/SupportDashboardActivity.java
+++ b/Settings/src/com/android/settings/support/SupportDashboardActivity.java
@@ -19,7 +19,7 @@ import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.overlay.SupportFeatureProvider;
import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/Settings/src/com/android/settings/support/actionbar/HelpResourceProvider.java b/Settings/src/com/android/settings/support/actionbar/HelpResourceProvider.java
index 28989868..a332d31a 100644
--- a/Settings/src/com/android/settings/support/actionbar/HelpResourceProvider.java
+++ b/Settings/src/com/android/settings/support/actionbar/HelpResourceProvider.java
@@ -16,7 +16,7 @@
package com.android.settings.support.actionbar;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public interface HelpResourceProvider {
/**
diff --git a/Settings/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java b/Settings/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java
index 868f10f3..fcaea15d 100644
--- a/Settings/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java
+++ b/Settings/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java
@@ -30,7 +30,7 @@ public class AdditionalSystemUpdatePreferenceController extends BasePreferenceCo
@Override
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(
- com.android.settings.R.bool.config_additional_system_update_setting_enable)
+ com.cariad.cea.settings.R.bool.config_additional_system_update_setting_enable)
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
diff --git a/Settings/src/com/android/settings/system/DeveloperOptionsController.kt b/Settings/src/com/android/settings/system/DeveloperOptionsController.kt
index 6874ec75..4dca6290 100644
--- a/Settings/src/com/android/settings/system/DeveloperOptionsController.kt
+++ b/Settings/src/com/android/settings/system/DeveloperOptionsController.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.SubSettingLauncher
import com.android.settings.development.DevelopmentSettingsDashboardFragment
import com.android.settings.spa.preference.ComposePreferenceController
diff --git a/Settings/src/com/android/settings/system/ResetDashboardFragment.java b/Settings/src/com/android/settings/system/ResetDashboardFragment.java
index a8704a5d..0e879e66 100644
--- a/Settings/src/com/android/settings/system/ResetDashboardFragment.java
+++ b/Settings/src/com/android/settings/system/ResetDashboardFragment.java
@@ -19,7 +19,7 @@ package com.android.settings.system;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.manageapplications.ResetAppPrefPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.EraseEuiccDataController;
diff --git a/Settings/src/com/android/settings/system/ResetPreferenceController.java b/Settings/src/com/android/settings/system/ResetPreferenceController.java
index 35f1ff7a..30b0f278 100644
--- a/Settings/src/com/android/settings/system/ResetPreferenceController.java
+++ b/Settings/src/com/android/settings/system/ResetPreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.system;
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.NetworkResetPreferenceController;
diff --git a/Settings/src/com/android/settings/system/SystemDashboardFragment.java b/Settings/src/com/android/settings/system/SystemDashboardFragment.java
index 678b675e..0613436c 100644
--- a/Settings/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/Settings/src/com/android/settings/system/SystemDashboardFragment.java
@@ -22,7 +22,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/system/SystemUpdatePreferenceController.kt b/Settings/src/com/android/settings/system/SystemUpdatePreferenceController.kt
index 87a402e2..57920f9c 100644
--- a/Settings/src/com/android/settings/system/SystemUpdatePreferenceController.kt
+++ b/Settings/src/com/android/settings/system/SystemUpdatePreferenceController.kt
@@ -27,7 +27,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settingslib.spaprivileged.framework.common.userManager
import kotlinx.coroutines.launch
diff --git a/Settings/src/com/android/settings/theme/ContrastPreferenceController.kt b/Settings/src/com/android/settings/theme/ContrastPreferenceController.kt
index 7f3844a9..76e4b962 100644
--- a/Settings/src/com/android/settings/theme/ContrastPreferenceController.kt
+++ b/Settings/src/com/android/settings/theme/ContrastPreferenceController.kt
@@ -25,7 +25,7 @@ import android.os.UserHandle
import android.text.TextUtils
import androidx.preference.Preference
import com.android.internal.annotations.VisibleForTesting
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
/**
diff --git a/Settings/src/com/android/settings/tts/TextToSpeechSettings.java b/Settings/src/com/android/settings/tts/TextToSpeechSettings.java
index 8ff0159f..74ee6883 100644
--- a/Settings/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/Settings/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -42,7 +42,7 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/Settings/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
index f6416db5..9e7d1256 100644
--- a/Settings/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
+++ b/Settings/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
@@ -14,7 +14,7 @@ import android.util.Log;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.search.SearchIndexable;
diff --git a/Settings/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/Settings/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index ce5533e5..c3131021 100644
--- a/Settings/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
+++ b/Settings/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -20,7 +20,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/src/com/android/settings/users/AppCopyFragment.java b/Settings/src/com/android/settings/users/AppCopyFragment.java
index 858de515..eb3ccef7 100644
--- a/Settings/src/com/android/settings/users/AppCopyFragment.java
+++ b/Settings/src/com/android/settings/users/AppCopyFragment.java
@@ -29,7 +29,7 @@ import android.util.Log;
import androidx.preference.PreferenceGroup;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settingslib.users.AppCopyHelper;
diff --git a/Settings/src/com/android/settings/users/AppRestrictionsFragment.java b/Settings/src/com/android/settings/users/AppRestrictionsFragment.java
index 15324487..72ff0c01 100644
--- a/Settings/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/Settings/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -56,7 +56,7 @@ import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settingslib.users.AppRestrictionsHelper;
diff --git a/Settings/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/Settings/src/com/android/settings/users/AutoSyncDataPreferenceController.java
index 29c5c573..e2a17436 100644
--- a/Settings/src/com/android/settings/users/AutoSyncDataPreferenceController.java
+++ b/Settings/src/com/android/settings/users/AutoSyncDataPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/users/GuestTelephonyPreferenceController.java b/Settings/src/com/android/settings/users/GuestTelephonyPreferenceController.java
index 83e4bfc5..525d6f90 100644
--- a/Settings/src/com/android/settings/users/GuestTelephonyPreferenceController.java
+++ b/Settings/src/com/android/settings/users/GuestTelephonyPreferenceController.java
@@ -23,7 +23,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/users/MultiUserPreferenceController.java b/Settings/src/com/android/settings/users/MultiUserPreferenceController.java
index 2eb57ecd..3416228f 100644
--- a/Settings/src/com/android/settings/users/MultiUserPreferenceController.java
+++ b/Settings/src/com/android/settings/users/MultiUserPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/src/com/android/settings/users/OwnerInfoSettings.java b/Settings/src/com/android/settings/users/OwnerInfoSettings.java
index d06ba64d..f1d011b0 100644
--- a/Settings/src/com/android/settings/users/OwnerInfoSettings.java
+++ b/Settings/src/com/android/settings/users/OwnerInfoSettings.java
@@ -31,7 +31,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.security.OwnerInfoPreferenceController.OwnerInfoCallback;
diff --git a/Settings/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java b/Settings/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java
index 01df5fdd..0ee3c908 100644
--- a/Settings/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java
+++ b/Settings/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java
@@ -30,7 +30,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/src/com/android/settings/users/RestrictionUtils.java b/Settings/src/com/android/settings/users/RestrictionUtils.java
index 4d4a2dd5..87b6d90f 100644
--- a/Settings/src/com/android/settings/users/RestrictionUtils.java
+++ b/Settings/src/com/android/settings/users/RestrictionUtils.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/users/TimeoutToDockUserPreferenceController.java b/Settings/src/com/android/settings/users/TimeoutToDockUserPreferenceController.java
index 322a4abb..dd12ff03 100644
--- a/Settings/src/com/android/settings/users/TimeoutToDockUserPreferenceController.java
+++ b/Settings/src/com/android/settings/users/TimeoutToDockUserPreferenceController.java
@@ -47,9 +47,9 @@ public class TimeoutToDockUserPreferenceController extends BasePreferenceControl
mUserManager = context.getSystemService(UserManager.class);
mEntries = mContext.getResources().getStringArray(
- com.android.settings.R.array.switch_to_dock_user_when_docked_timeout_entries);
+ com.cariad.cea.settings.R.array.switch_to_dock_user_when_docked_timeout_entries);
mValues = mContext.getResources().getStringArray(
- com.android.settings.R.array.switch_to_dock_user_when_docked_timeout_values);
+ com.cariad.cea.settings.R.array.switch_to_dock_user_when_docked_timeout_values);
}
@Override
diff --git a/Settings/src/com/android/settings/users/TimeoutToDockUserSettings.java b/Settings/src/com/android/settings/users/TimeoutToDockUserSettings.java
index 60bbdbbc..b2dd4eb7 100644
--- a/Settings/src/com/android/settings/users/TimeoutToDockUserSettings.java
+++ b/Settings/src/com/android/settings/users/TimeoutToDockUserSettings.java
@@ -24,7 +24,7 @@ import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/src/com/android/settings/users/UserCapabilities.java b/Settings/src/com/android/settings/users/UserCapabilities.java
index cf0e10b1..f0a503a6 100644
--- a/Settings/src/com/android/settings/users/UserCapabilities.java
+++ b/Settings/src/com/android/settings/users/UserCapabilities.java
@@ -23,7 +23,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
diff --git a/Settings/src/com/android/settings/users/UserDetailsSettings.java b/Settings/src/com/android/settings/users/UserDetailsSettings.java
index a030d865..01a6718d 100644
--- a/Settings/src/com/android/settings/users/UserDetailsSettings.java
+++ b/Settings/src/com/android/settings/users/UserDetailsSettings.java
@@ -34,7 +34,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/users/UserDialogs.java b/Settings/src/com/android/settings/users/UserDialogs.java
index c2f25285..a6ec95b2 100644
--- a/Settings/src/com/android/settings/users/UserDialogs.java
+++ b/Settings/src/com/android/settings/users/UserDialogs.java
@@ -37,7 +37,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
/**
diff --git a/Settings/src/com/android/settings/users/UserSettings.java b/Settings/src/com/android/settings/users/UserSettings.java
index 70d8ed37..5ecf4f56 100644
--- a/Settings/src/com/android/settings/users/UserSettings.java
+++ b/Settings/src/com/android/settings/users/UserSettings.java
@@ -68,7 +68,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.util.UserIcons;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/utils/ManagedServiceSettings.java b/Settings/src/com/android/settings/utils/ManagedServiceSettings.java
index 9f5fbc51..68f1ef66 100644
--- a/Settings/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/Settings/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -38,7 +38,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.widget.EmptyTextSettings;
diff --git a/Settings/src/com/android/settings/uwb/UwbPreferenceController.java b/Settings/src/com/android/settings/uwb/UwbPreferenceController.java
index 59b35349..fd924deb 100644
--- a/Settings/src/com/android/settings/uwb/UwbPreferenceController.java
+++ b/Settings/src/com/android/settings/uwb/UwbPreferenceController.java
@@ -40,7 +40,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import java.util.concurrent.Executor;
diff --git a/Settings/src/com/android/settings/vpn2/AppDialog.java b/Settings/src/com/android/settings/vpn2/AppDialog.java
index 815b28bf..3f92d97c 100644
--- a/Settings/src/com/android/settings/vpn2/AppDialog.java
+++ b/Settings/src/com/android/settings/vpn2/AppDialog.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* UI for managing the connection controlled by an app.
diff --git a/Settings/src/com/android/settings/vpn2/AppDialogFragment.java b/Settings/src/com/android/settings/vpn2/AppDialogFragment.java
index b5623fd1..fe20661e 100644
--- a/Settings/src/com/android/settings/vpn2/AppDialogFragment.java
+++ b/Settings/src/com/android/settings/vpn2/AppDialogFragment.java
@@ -30,7 +30,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.android.internal.net.VpnConfig;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/vpn2/AppManagementFragment.java b/Settings/src/com/android/settings/vpn2/AppManagementFragment.java
index 00c8f599..364cd554 100644
--- a/Settings/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/Settings/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -42,7 +42,7 @@ import androidx.preference.Preference;
import com.android.internal.net.VpnConfig;
import com.android.internal.util.ArrayUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/Settings/src/com/android/settings/vpn2/AppPreference.java b/Settings/src/com/android/settings/vpn2/AppPreference.java
index 12b7b908..8d2cb21f 100644
--- a/Settings/src/com/android/settings/vpn2/AppPreference.java
+++ b/Settings/src/com/android/settings/vpn2/AppPreference.java
@@ -29,7 +29,7 @@ import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* {@link androidx.preference.Preference} containing information about a VPN
diff --git a/Settings/src/com/android/settings/vpn2/ConfigDialog.java b/Settings/src/com/android/settings/vpn2/ConfigDialog.java
index 1c001cb8..a653b7af 100644
--- a/Settings/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/Settings/src/com/android/settings/vpn2/ConfigDialog.java
@@ -38,7 +38,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.internal.net.VpnProfile;
import com.android.net.module.util.ProxyUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.utils.AndroidKeystoreAliasLoader;
import java.util.Collection;
diff --git a/Settings/src/com/android/settings/vpn2/ConfigDialogFragment.java b/Settings/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 559003aa..4fcbbe98 100644
--- a/Settings/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/Settings/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -34,7 +34,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnProfile;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/vpn2/ConfirmLockdownFragment.java b/Settings/src/com/android/settings/vpn2/ConfirmLockdownFragment.java
index 1e8074c6..13248000 100644
--- a/Settings/src/com/android/settings/vpn2/ConfirmLockdownFragment.java
+++ b/Settings/src/com/android/settings/vpn2/ConfirmLockdownFragment.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class ConfirmLockdownFragment extends InstrumentedDialogFragment
diff --git a/Settings/src/com/android/settings/vpn2/LegacyVpnPreference.java b/Settings/src/com/android/settings/vpn2/LegacyVpnPreference.java
index e44a0570..f46db5fc 100644
--- a/Settings/src/com/android/settings/vpn2/LegacyVpnPreference.java
+++ b/Settings/src/com/android/settings/vpn2/LegacyVpnPreference.java
@@ -25,7 +25,7 @@ import android.view.View;
import androidx.preference.Preference;
import com.android.internal.net.VpnProfile;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* {@link androidx.preference.Preference} tracks the underlying legacy vpn profile and
diff --git a/Settings/src/com/android/settings/vpn2/ManageablePreference.java b/Settings/src/com/android/settings/vpn2/ManageablePreference.java
index 291b6d22..b99875f8 100644
--- a/Settings/src/com/android/settings/vpn2/ManageablePreference.java
+++ b/Settings/src/com/android/settings/vpn2/ManageablePreference.java
@@ -27,7 +27,7 @@ import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.Utils;
diff --git a/Settings/src/com/android/settings/vpn2/VpnInfoPreference.java b/Settings/src/com/android/settings/vpn2/VpnInfoPreference.java
index 9e70a5d5..0c5f1976 100644
--- a/Settings/src/com/android/settings/vpn2/VpnInfoPreference.java
+++ b/Settings/src/com/android/settings/vpn2/VpnInfoPreference.java
@@ -25,7 +25,7 @@ import android.view.View;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/src/com/android/settings/vpn2/VpnSettings.java b/Settings/src/com/android/settings/vpn2/VpnSettings.java
index 0ee21b9e..902f5075 100644
--- a/Settings/src/com/android/settings/vpn2/VpnSettings.java
+++ b/Settings/src/com/android/settings/vpn2/VpnSettings.java
@@ -60,7 +60,7 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.GearPreference;
diff --git a/Settings/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java b/Settings/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
index f6b5a843..83ca6e73 100644
--- a/Settings/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
+++ b/Settings/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
@@ -25,7 +25,7 @@ import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.display.WallpaperPreferenceController;
diff --git a/Settings/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/Settings/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
index 675e10fc..97601235 100644
--- a/Settings/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
+++ b/Settings/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
@@ -23,7 +23,7 @@ import android.content.Intent;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.display.WallpaperPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
diff --git a/Settings/src/com/android/settings/wallpaper/WallpaperTypeSettings.java b/Settings/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
index 2d4a16f2..57cc5da3 100644
--- a/Settings/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
+++ b/Settings/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
@@ -18,7 +18,7 @@ package com.android.settings.wallpaper;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/src/com/android/settings/webview/WebViewAppPicker.java b/Settings/src/com/android/settings/webview/WebViewAppPicker.java
index b1dfd145..51f2cbe9 100644
--- a/Settings/src/com/android/settings/webview/WebViewAppPicker.java
+++ b/Settings/src/com/android/settings/webview/WebViewAppPicker.java
@@ -31,7 +31,7 @@ import android.webkit.UserPackage;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
diff --git a/Settings/src/com/android/settings/wfd/WifiDisplayPreferenceController.java b/Settings/src/com/android/settings/wfd/WifiDisplayPreferenceController.java
index b15396b7..3d4ac3a4 100644
--- a/Settings/src/com/android/settings/wfd/WifiDisplayPreferenceController.java
+++ b/Settings/src/com/android/settings/wfd/WifiDisplayPreferenceController.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
diff --git a/Settings/src/com/android/settings/wfd/WifiDisplaySettings.java b/Settings/src/com/android/settings/wfd/WifiDisplaySettings.java
index 2ec69c43..6b200436 100644
--- a/Settings/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/Settings/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -63,7 +63,7 @@ import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
import com.android.internal.app.MediaRouteDialogPresenter;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
diff --git a/Settings/src/com/android/settings/widget/AddPreference.java b/Settings/src/com/android/settings/widget/AddPreference.java
index 2183fd4f..e93d8bc9 100644
--- a/Settings/src/com/android/settings/widget/AddPreference.java
+++ b/Settings/src/com/android/settings/widget/AddPreference.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedPreference;
import androidx.annotation.VisibleForTesting;
diff --git a/Settings/src/com/android/settings/widget/AppCheckBoxPreference.java b/Settings/src/com/android/settings/widget/AppCheckBoxPreference.java
index aa7e0e5f..1ed95ab0 100644
--- a/Settings/src/com/android/settings/widget/AppCheckBoxPreference.java
+++ b/Settings/src/com/android/settings/widget/AppCheckBoxPreference.java
@@ -25,7 +25,7 @@ import android.widget.LinearLayout;
import androidx.preference.CheckBoxPreference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* {@link CheckBoxPreference} that used only to display app
diff --git a/Settings/src/com/android/settings/widget/AspectRatioFrameLayout.java b/Settings/src/com/android/settings/widget/AspectRatioFrameLayout.java
index aa3d3c4e..edaf8027 100644
--- a/Settings/src/com/android/settings/widget/AspectRatioFrameLayout.java
+++ b/Settings/src/com/android/settings/widget/AspectRatioFrameLayout.java
@@ -21,7 +21,7 @@ import android.widget.FrameLayout;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A {@link FrameLayout} with customizable aspect ratio.
diff --git a/Settings/src/com/android/settings/widget/BottomLabelLayout.java b/Settings/src/com/android/settings/widget/BottomLabelLayout.java
index 64f27aa8..17bbef1d 100644
--- a/Settings/src/com/android/settings/widget/BottomLabelLayout.java
+++ b/Settings/src/com/android/settings/widget/BottomLabelLayout.java
@@ -83,7 +83,7 @@ public class BottomLabelLayout extends LinearLayout {
setOrientation(stacked ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
setGravity(stacked ? Gravity.START : Gravity.BOTTOM);
- final View spacer = findViewById(com.android.settings.R.id.spacer);
+ final View spacer = findViewById(com.cariad.cea.settings.R.id.spacer);
if (spacer != null) {
spacer.setVisibility(stacked ? View.GONE : View.VISIBLE);
}
diff --git a/Settings/src/com/android/settings/widget/ChartGridView.java b/Settings/src/com/android/settings/widget/ChartGridView.java
index de794823..a1b7a4bd 100644
--- a/Settings/src/com/android/settings/widget/ChartGridView.java
+++ b/Settings/src/com/android/settings/widget/ChartGridView.java
@@ -32,7 +32,7 @@ import android.util.AttributeSet;
import android.view.View;
import com.android.internal.util.Preconditions;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Background of {@link ChartView} that renders grid lines as requested by
diff --git a/Settings/src/com/android/settings/widget/ChartSweepView.java b/Settings/src/com/android/settings/widget/ChartSweepView.java
index de1bc085..db4dc7a1 100644
--- a/Settings/src/com/android/settings/widget/ChartSweepView.java
+++ b/Settings/src/com/android/settings/widget/ChartSweepView.java
@@ -36,7 +36,7 @@ import android.view.MotionEvent;
import android.view.View;
import com.android.internal.util.Preconditions;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Sweep across a {@link ChartView} at a specific {@link ChartAxis} value, which
diff --git a/Settings/src/com/android/settings/widget/ChartView.java b/Settings/src/com/android/settings/widget/ChartView.java
index 768a7173..165cb1f6 100644
--- a/Settings/src/com/android/settings/widget/ChartView.java
+++ b/Settings/src/com/android/settings/widget/ChartView.java
@@ -26,7 +26,7 @@ import android.view.ViewDebug;
import android.widget.FrameLayout;
import com.android.internal.util.Preconditions;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Container for two-dimensional chart, drawn with a combination of
diff --git a/Settings/src/com/android/settings/widget/DotsPageIndicator.java b/Settings/src/com/android/settings/widget/DotsPageIndicator.java
index 88e69510..1298662c 100644
--- a/Settings/src/com/android/settings/widget/DotsPageIndicator.java
+++ b/Settings/src/com/android/settings/widget/DotsPageIndicator.java
@@ -36,7 +36,7 @@ import android.view.animation.Interpolator;
import androidx.viewpager.widget.ViewPager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Arrays;
diff --git a/Settings/src/com/android/settings/widget/EmptyTextSettings.java b/Settings/src/com/android/settings/widget/EmptyTextSettings.java
index ddd13701..2f44820d 100644
--- a/Settings/src/com/android/settings/widget/EmptyTextSettings.java
+++ b/Settings/src/com/android/settings/widget/EmptyTextSettings.java
@@ -26,7 +26,7 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
public abstract class EmptyTextSettings extends SettingsPreferenceFragment {
diff --git a/Settings/src/com/android/settings/widget/EntityHeaderController.java b/Settings/src/com/android/settings/widget/EntityHeaderController.java
index c89b7bb4..0234b761 100644
--- a/Settings/src/com/android/settings/widget/EntityHeaderController.java
+++ b/Settings/src/com/android/settings/widget/EntityHeaderController.java
@@ -39,7 +39,7 @@ import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/settings/widget/FixedLineSummaryPreference.java b/Settings/src/com/android/settings/widget/FixedLineSummaryPreference.java
index 534ab08a..aaeec2df 100644
--- a/Settings/src/com/android/settings/widget/FixedLineSummaryPreference.java
+++ b/Settings/src/com/android/settings/widget/FixedLineSummaryPreference.java
@@ -23,7 +23,7 @@ import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A preference whose summary text will only span one single line.
diff --git a/Settings/src/com/android/settings/widget/GearPreference.java b/Settings/src/com/android/settings/widget/GearPreference.java
index df526603..5cc1b31b 100644
--- a/Settings/src/com/android/settings/widget/GearPreference.java
+++ b/Settings/src/com/android/settings/widget/GearPreference.java
@@ -22,7 +22,7 @@ import android.view.View;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedPreference;
/**
diff --git a/Settings/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/Settings/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index 7145460d..4f0fa486 100644
--- a/Settings/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/Settings/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -38,7 +38,7 @@ import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.google.android.material.appbar.AppBarLayout;
diff --git a/Settings/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java b/Settings/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
index 8084a481..36db8200 100644
--- a/Settings/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
+++ b/Settings/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
@@ -32,7 +32,7 @@ import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
import androidx.window.embedding.ActivityEmbeddingController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.homepage.SettingsHomepageActivity;
diff --git a/Settings/src/com/android/settings/widget/HomepagePreferenceLayoutHelper.java b/Settings/src/com/android/settings/widget/HomepagePreferenceLayoutHelper.java
index 6242e230..1a4a9949 100644
--- a/Settings/src/com/android/settings/widget/HomepagePreferenceLayoutHelper.java
+++ b/Settings/src/com/android/settings/widget/HomepagePreferenceLayoutHelper.java
@@ -21,7 +21,7 @@ import android.view.View;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** Helper for homepage preference to manage layout. */
public class HomepagePreferenceLayoutHelper {
diff --git a/Settings/src/com/android/settings/widget/LabeledSeekBarPreference.java b/Settings/src/com/android/settings/widget/LabeledSeekBarPreference.java
index 6300bd3b..63c8d110 100644
--- a/Settings/src/com/android/settings/widget/LabeledSeekBarPreference.java
+++ b/Settings/src/com/android/settings/widget/LabeledSeekBarPreference.java
@@ -30,7 +30,7 @@ import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.util.Preconditions;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
/**
diff --git a/Settings/src/com/android/settings/widget/MutableGearPreference.java b/Settings/src/com/android/settings/widget/MutableGearPreference.java
index b0804ebc..5ada269d 100644
--- a/Settings/src/com/android/settings/widget/MutableGearPreference.java
+++ b/Settings/src/com/android/settings/widget/MutableGearPreference.java
@@ -22,7 +22,7 @@ import android.widget.ImageView;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.ColorUtil;
/** A preference with a Gear on the side and mutable Gear color. */
diff --git a/Settings/src/com/android/settings/widget/PrimaryCheckBoxPreference.java b/Settings/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
index c90f1983..7d6df128 100644
--- a/Settings/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
+++ b/Settings/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
@@ -24,7 +24,7 @@ import android.widget.CheckBox;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.TwoTargetPreference;
/**
diff --git a/Settings/src/com/android/settings/widget/RadioButtonPickerFragment.java b/Settings/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 6d94fc90..1fcb3894 100644
--- a/Settings/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/Settings/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -33,7 +33,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceXmlParserUtils;
diff --git a/Settings/src/com/android/settings/widget/RingProgressBar.java b/Settings/src/com/android/settings/widget/RingProgressBar.java
index 605e4e91..d9273f86 100644
--- a/Settings/src/com/android/settings/widget/RingProgressBar.java
+++ b/Settings/src/com/android/settings/widget/RingProgressBar.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.widget.ProgressBar;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A (determinate) progress bar in the form of a ring. The progress bar goes clockwise starting
diff --git a/Settings/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/Settings/src/com/android/settings/widget/SettingsMainSwitchPreference.java
index 9f6d787e..1daef764 100644
--- a/Settings/src/com/android/settings/widget/SettingsMainSwitchPreference.java
+++ b/Settings/src/com/android/settings/widget/SettingsMainSwitchPreference.java
@@ -26,7 +26,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.PreferenceViewHolder;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SettingsMainSwitchBar.OnBeforeCheckedChangeListener;
import com.android.settingslib.RestrictedPreferenceHelper;
import com.android.settingslib.core.instrumentation.SettingsJankMonitor;
diff --git a/Settings/src/com/android/settings/widget/SingleTargetGearPreference.java b/Settings/src/com/android/settings/widget/SingleTargetGearPreference.java
index e6a833d0..bae2bbd4 100644
--- a/Settings/src/com/android/settings/widget/SingleTargetGearPreference.java
+++ b/Settings/src/com/android/settings/widget/SingleTargetGearPreference.java
@@ -23,7 +23,7 @@ import android.view.View;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A preference with single target and a gear icon on the side.
diff --git a/Settings/src/com/android/settings/widget/SlidingTabLayout.java b/Settings/src/com/android/settings/widget/SlidingTabLayout.java
index 3ae4e3cc..8f0d6e64 100644
--- a/Settings/src/com/android/settings/widget/SlidingTabLayout.java
+++ b/Settings/src/com/android/settings/widget/SlidingTabLayout.java
@@ -27,7 +27,7 @@ import android.widget.TextView;
import androidx.viewpager.widget.PagerAdapter;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* To be used with ViewPager to provide a tab indicator component which give constant feedback as
diff --git a/Settings/src/com/android/settings/widget/TickButtonPreference.java b/Settings/src/com/android/settings/widget/TickButtonPreference.java
index b9b9b19b..3155ce05 100644
--- a/Settings/src/com/android/settings/widget/TickButtonPreference.java
+++ b/Settings/src/com/android/settings/widget/TickButtonPreference.java
@@ -24,7 +24,7 @@ import android.widget.ImageView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** A preference with tick icon. */
public class TickButtonPreference extends Preference {
diff --git a/Settings/src/com/android/settings/widget/TintDrawable.java b/Settings/src/com/android/settings/widget/TintDrawable.java
index 7b348905..d2fa1dd3 100644
--- a/Settings/src/com/android/settings/widget/TintDrawable.java
+++ b/Settings/src/com/android/settings/widget/TintDrawable.java
@@ -27,7 +27,7 @@ import android.util.AttributeSet;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/Settings/src/com/android/settings/widget/TwoStateButtonPreference.java b/Settings/src/com/android/settings/widget/TwoStateButtonPreference.java
index eeee65de..19a054dc 100644
--- a/Settings/src/com/android/settings/widget/TwoStateButtonPreference.java
+++ b/Settings/src/com/android/settings/widget/TwoStateButtonPreference.java
@@ -25,7 +25,7 @@ import android.widget.Button;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.TypedArrayUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.LayoutPreference;
/**
diff --git a/Settings/src/com/android/settings/widget/UsageGraph.java b/Settings/src/com/android/settings/widget/UsageGraph.java
index c92ea1bd..8f187bc7 100644
--- a/Settings/src/com/android/settings/widget/UsageGraph.java
+++ b/Settings/src/com/android/settings/widget/UsageGraph.java
@@ -37,7 +37,7 @@ import android.view.View;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
public class UsageGraph extends View {
diff --git a/Settings/src/com/android/settings/widget/UsageView.java b/Settings/src/com/android/settings/widget/UsageView.java
index 6a721db0..6799e33c 100644
--- a/Settings/src/com/android/settings/widget/UsageView.java
+++ b/Settings/src/com/android/settings/widget/UsageView.java
@@ -28,7 +28,7 @@ import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.Locale;
diff --git a/Settings/src/com/android/settings/widget/VideoPreference.java b/Settings/src/com/android/settings/widget/VideoPreference.java
index fe916691..44529730 100644
--- a/Settings/src/com/android/settings/widget/VideoPreference.java
+++ b/Settings/src/com/android/settings/widget/VideoPreference.java
@@ -31,7 +31,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A full width preference that hosts a MP4 video or a {@link AnimatedVectorDrawableCompat}.
diff --git a/Settings/src/com/android/settings/wifi/AddNetworkFragment.java b/Settings/src/com/android/settings/wifi/AddNetworkFragment.java
index f5bf5eec..0307dc3d 100644
--- a/Settings/src/com/android/settings/wifi/AddNetworkFragment.java
+++ b/Settings/src/com/android/settings/wifi/AddNetworkFragment.java
@@ -38,7 +38,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.wifi.dpp.WifiDppQrCodeScannerFragment;
import com.android.settings.wifi.dpp.WifiDppUtils;
diff --git a/Settings/src/com/android/settings/wifi/AddWifiNetworkPreference.java b/Settings/src/com/android/settings/wifi/AddWifiNetworkPreference.java
index 999f4a4d..ab23cc58 100644
--- a/Settings/src/com/android/settings/wifi/AddWifiNetworkPreference.java
+++ b/Settings/src/com/android/settings/wifi/AddWifiNetworkPreference.java
@@ -28,7 +28,7 @@ import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/Settings/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
index 59ad4408..595fca1c 100644
--- a/Settings/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
@@ -22,7 +22,7 @@ import android.provider.Settings;
import android.telephony.SubscriptionManager;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
diff --git a/Settings/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/Settings/src/com/android/settings/wifi/ChangeWifiStateDetails.java
index 9271100b..7fd35526 100644
--- a/Settings/src/com/android/settings/wifi/ChangeWifiStateDetails.java
+++ b/Settings/src/com/android/settings/wifi/ChangeWifiStateDetails.java
@@ -26,7 +26,7 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java b/Settings/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
index 652d318b..a8f05434 100644
--- a/Settings/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
+++ b/Settings/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
@@ -36,7 +36,7 @@ import android.widget.Button;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
diff --git a/Settings/src/com/android/settings/wifi/ConfigureWifiSettings.java b/Settings/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 2b3bedbe..deac08e9 100644
--- a/Settings/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/Settings/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -31,7 +31,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
diff --git a/Settings/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java b/Settings/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java
index cd0dad17..b634042a 100644
--- a/Settings/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java
+++ b/Settings/src/com/android/settings/wifi/ConnectedWifiEntryPreference.java
@@ -21,7 +21,7 @@ import android.view.View;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.wifitrackerlib.WifiEntry;
/**
diff --git a/Settings/src/com/android/settings/wifi/LinkablePreference.java b/Settings/src/com/android/settings/wifi/LinkablePreference.java
index adcfe32b..c1b294a9 100644
--- a/Settings/src/com/android/settings/wifi/LinkablePreference.java
+++ b/Settings/src/com/android/settings/wifi/LinkablePreference.java
@@ -29,7 +29,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.LinkifyUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* A preference with a title that can have linkable content on click.
diff --git a/Settings/src/com/android/settings/wifi/NetworkRequestDialogActivity.java b/Settings/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
index 7b7d33fd..1dc58d19 100644
--- a/Settings/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
+++ b/Settings/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
@@ -36,7 +36,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import java.util.List;
diff --git a/Settings/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java b/Settings/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
index f2e24ae0..c8a74a04 100644
--- a/Settings/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
+++ b/Settings/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
@@ -26,7 +26,7 @@ import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.util.List;
diff --git a/Settings/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/Settings/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index d1c3cac3..7aa713ba 100644
--- a/Settings/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/Settings/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -47,7 +47,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.internal.PreferenceImageView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
import com.android.wifitrackerlib.WifiEntry;
diff --git a/Settings/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java b/Settings/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java
index aebd072c..a7986510 100644
--- a/Settings/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java
+++ b/Settings/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java
@@ -26,7 +26,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
diff --git a/Settings/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java b/Settings/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
index ec919276..ffb9614b 100644
--- a/Settings/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
+++ b/Settings/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
@@ -10,7 +10,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* This is similar fragment with {@link NetworkRequestDialogFragment} but only for single SSID mode.
diff --git a/Settings/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/Settings/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
index 4b7506d4..bb8abdf2 100644
--- a/Settings/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
@@ -26,7 +26,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/Settings/src/com/android/settings/wifi/RequestToggleWiFiActivity.java
index 6887b780..8bc01bff 100644
--- a/Settings/src/com/android/settings/wifi/RequestToggleWiFiActivity.java
+++ b/Settings/src/com/android/settings/wifi/RequestToggleWiFiActivity.java
@@ -39,7 +39,7 @@ import androidx.annotation.NonNull;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.AlertActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* This activity handles requests to toggle WiFi by collecting user
diff --git a/Settings/src/com/android/settings/wifi/WepNetworksPreferenceController.kt b/Settings/src/com/android/settings/wifi/WepNetworksPreferenceController.kt
index 2db0e020..8d5de932 100644
--- a/Settings/src/com/android/settings/wifi/WepNetworksPreferenceController.kt
+++ b/Settings/src/com/android/settings/wifi/WepNetworksPreferenceController.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.fragment.app.Fragment
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.spa.preference.ComposePreferenceController
import com.android.settingslib.spa.framework.compose.OverridableFlow
import com.android.settingslib.spa.widget.dialog.AlertDialogButton
diff --git a/Settings/src/com/android/settings/wifi/WifiAPITest.java b/Settings/src/com/android/settings/wifi/WifiAPITest.java
index c8bcf7fe..f16ccbbc 100644
--- a/Settings/src/com/android/settings/wifi/WifiAPITest.java
+++ b/Settings/src/com/android/settings/wifi/WifiAPITest.java
@@ -29,7 +29,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
/**
diff --git a/Settings/src/com/android/settings/wifi/WifiConfigController.java b/Settings/src/com/android/settings/wifi/WifiConfigController.java
index 94e66bfc..eb060af6 100644
--- a/Settings/src/com/android/settings/wifi/WifiConfigController.java
+++ b/Settings/src/com/android/settings/wifi/WifiConfigController.java
@@ -69,7 +69,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.net.module.util.NetUtils;
import com.android.net.module.util.ProxyUtils;
import com.android.settings.ProxySelector;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.utils.AndroidKeystoreAliasLoader;
import com.android.settings.wifi.dpp.WifiDppUtils;
diff --git a/Settings/src/com/android/settings/wifi/WifiConfigController2.java b/Settings/src/com/android/settings/wifi/WifiConfigController2.java
index 92ab9e82..4dabd086 100644
--- a/Settings/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/Settings/src/com/android/settings/wifi/WifiConfigController2.java
@@ -71,7 +71,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.net.module.util.NetUtils;
import com.android.net.module.util.ProxyUtils;
import com.android.settings.ProxySelector;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.utils.AndroidKeystoreAliasLoader;
import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
diff --git a/Settings/src/com/android/settings/wifi/WifiConfigInfo.java b/Settings/src/com/android/settings/wifi/WifiConfigInfo.java
index 0de30639..35fc38bd 100644
--- a/Settings/src/com/android/settings/wifi/WifiConfigInfo.java
+++ b/Settings/src/com/android/settings/wifi/WifiConfigInfo.java
@@ -22,7 +22,7 @@ import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/wifi/WifiConnectionPreferenceController.java b/Settings/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
index 05bd3bef..b0dd1b97 100644
--- a/Settings/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
diff --git a/Settings/src/com/android/settings/wifi/WifiDialog.java b/Settings/src/com/android/settings/wifi/WifiDialog.java
index a1ff1ac9..24198eae 100644
--- a/Settings/src/com/android/settings/wifi/WifiDialog.java
+++ b/Settings/src/com/android/settings/wifi/WifiDialog.java
@@ -27,7 +27,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.wifi.AccessPoint;
diff --git a/Settings/src/com/android/settings/wifi/WifiDialog2.kt b/Settings/src/com/android/settings/wifi/WifiDialog2.kt
index a0d215a2..f4b38640 100644
--- a/Settings/src/com/android/settings/wifi/WifiDialog2.kt
+++ b/Settings/src/com/android/settings/wifi/WifiDialog2.kt
@@ -27,7 +27,7 @@ import android.widget.ImageButton
import android.widget.TextView
import androidx.annotation.OpenForTesting
import androidx.appcompat.app.AlertDialog
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.RestrictedLockUtils
import com.android.settingslib.RestrictedLockUtilsInternal
import com.android.wifitrackerlib.WifiEntry
diff --git a/Settings/src/com/android/settings/wifi/WifiDialogActivity.java b/Settings/src/com/android/settings/wifi/WifiDialogActivity.java
index eb3d88a9..b3abb7b0 100644
--- a/Settings/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/Settings/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -41,7 +41,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.dpp.WifiDppUtils;
diff --git a/Settings/src/com/android/settings/wifi/WifiEnabler.java b/Settings/src/com/android/settings/wifi/WifiEnabler.java
index 794587de..77ca65f2 100644
--- a/Settings/src/com/android/settings/wifi/WifiEnabler.java
+++ b/Settings/src/com/android/settings/wifi/WifiEnabler.java
@@ -31,7 +31,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.WirelessUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/settings/wifi/WifiInfo.java b/Settings/src/com/android/settings/wifi/WifiInfo.java
index 0d6d63d7..d48b7eba 100644
--- a/Settings/src/com/android/settings/wifi/WifiInfo.java
+++ b/Settings/src/com/android/settings/wifi/WifiInfo.java
@@ -19,7 +19,7 @@ package com.android.settings.wifi;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
/**
diff --git a/Settings/src/com/android/settings/wifi/WifiNoInternetDialog.java b/Settings/src/com/android/settings/wifi/WifiNoInternetDialog.java
index 57e42f82..488a3529 100644
--- a/Settings/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/Settings/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -42,7 +42,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* To display a dialog that asks the user whether to connect to a network that is not validated.
diff --git a/Settings/src/com/android/settings/wifi/WifiPickerActivity.java b/Settings/src/com/android/settings/wifi/WifiPickerActivity.java
index f26e15ad..bc98e57a 100644
--- a/Settings/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/Settings/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -18,7 +18,7 @@ package com.android.settings.wifi;
import android.content.Intent;
import com.android.settings.ButtonBarHandler;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.network.NetworkProviderSettings;
import com.android.settings.wifi.p2p.WifiP2pSettings;
diff --git a/Settings/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java b/Settings/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
index ae44b932..25771774 100644
--- a/Settings/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
@@ -19,7 +19,7 @@ import android.content.Context;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.GenericSwitchController;
import com.android.settings.widget.SummaryUpdater;
diff --git a/Settings/src/com/android/settings/wifi/WifiScanModeActivity.java b/Settings/src/com/android/settings/wifi/WifiScanModeActivity.java
index 446891a3..bdcb1e6b 100644
--- a/Settings/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/Settings/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -34,7 +34,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.wifi.WifiPermissionChecker;
diff --git a/Settings/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/Settings/src/com/android/settings/wifi/WifiScanningRequiredFragment.java
index 954a5ded..612aa40f 100644
--- a/Settings/src/com/android/settings/wifi/WifiScanningRequiredFragment.java
+++ b/Settings/src/com/android/settings/wifi/WifiScanningRequiredFragment.java
@@ -32,7 +32,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.HelpUtils;
diff --git a/Settings/src/com/android/settings/wifi/WifiStatusTest.java b/Settings/src/com/android/settings/wifi/WifiStatusTest.java
index b4f3ab6c..8f817778 100644
--- a/Settings/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/Settings/src/com/android/settings/wifi/WifiStatusTest.java
@@ -36,7 +36,7 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.wifi.AccessPoint;
import java.io.IOException;
diff --git a/Settings/src/com/android/settings/wifi/WifiSummaryUpdater.java b/Settings/src/com/android/settings/wifi/WifiSummaryUpdater.java
index 645d2eaf..91944faa 100644
--- a/Settings/src/com/android/settings/wifi/WifiSummaryUpdater.java
+++ b/Settings/src/com/android/settings/wifi/WifiSummaryUpdater.java
@@ -28,7 +28,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SummaryUpdater;
import com.android.settingslib.wifi.WifiStatusTracker;
diff --git a/Settings/src/com/android/settings/wifi/WifiUtils.java b/Settings/src/com/android/settings/wifi/WifiUtils.java
index 68d8bebd..c171aeae 100644
--- a/Settings/src/com/android/settings/wifi/WifiUtils.java
+++ b/Settings/src/com/android/settings/wifi/WifiUtils.java
@@ -35,7 +35,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.wifitrackerlib.WifiEntry;
diff --git a/Settings/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/Settings/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index e011eb85..08aa54cd 100644
--- a/Settings/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -33,7 +33,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/Settings/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java b/Settings/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java
index c52f75ec..6a805274 100644
--- a/Settings/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java
+++ b/Settings/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java
@@ -37,7 +37,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
diff --git a/Settings/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java b/Settings/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
index f4873cf3..115581a6 100644
--- a/Settings/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
+++ b/Settings/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
@@ -56,7 +56,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.preference.internal.PreferenceImageView;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/wifi/calling/DisclaimerItemListAdapter.java b/Settings/src/com/android/settings/wifi/calling/DisclaimerItemListAdapter.java
index 4b5d19c4..f9712279 100644
--- a/Settings/src/com/android/settings/wifi/calling/DisclaimerItemListAdapter.java
+++ b/Settings/src/com/android/settings/wifi/calling/DisclaimerItemListAdapter.java
@@ -25,7 +25,7 @@ import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimer.java b/Settings/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimer.java
index c044275f..6cd3c869 100644
--- a/Settings/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimer.java
+++ b/Settings/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimer.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.telephony.CarrierConfigManager;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Disclaimer item class for displaying emergency call limitation UI on
diff --git a/Settings/src/com/android/settings/wifi/calling/LinkifyDescriptionPreference.java b/Settings/src/com/android/settings/wifi/calling/LinkifyDescriptionPreference.java
index 60400b0f..77879c1f 100644
--- a/Settings/src/com/android/settings/wifi/calling/LinkifyDescriptionPreference.java
+++ b/Settings/src/com/android/settings/wifi/calling/LinkifyDescriptionPreference.java
@@ -30,7 +30,7 @@ import androidx.core.text.util.LinkifyCompat;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/** A preference which supports linkify text as a description in the summary **/
public class LinkifyDescriptionPreference extends Preference {
diff --git a/Settings/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java b/Settings/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java
index b91b39db..90fd7bd1 100644
--- a/Settings/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java
+++ b/Settings/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java
@@ -34,7 +34,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog.Builder;
import com.android.settings.CustomListPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* ListPreference contain the entry summary.
diff --git a/Settings/src/com/android/settings/wifi/calling/LocationPolicyDisclaimer.java b/Settings/src/com/android/settings/wifi/calling/LocationPolicyDisclaimer.java
index 6354bdd5..3cfe3a16 100644
--- a/Settings/src/com/android/settings/wifi/calling/LocationPolicyDisclaimer.java
+++ b/Settings/src/com/android/settings/wifi/calling/LocationPolicyDisclaimer.java
@@ -21,7 +21,7 @@ import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Disclaimer item class for displaying location privacy policy UI on
diff --git a/Settings/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragment.java b/Settings/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragment.java
index 7763226a..22e4143a 100644
--- a/Settings/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragment.java
+++ b/Settings/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragment.java
@@ -31,7 +31,7 @@ import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedFragment;
import java.util.ArrayList;
diff --git a/Settings/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/Settings/src/com/android/settings/wifi/calling/WifiCallingSettings.java
index 0c3457ca..45c536e1 100644
--- a/Settings/src/com/android/settings/wifi/calling/WifiCallingSettings.java
+++ b/Settings/src/com/android/settings/wifi/calling/WifiCallingSettings.java
@@ -35,7 +35,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import com.android.internal.util.CollectionUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.network.ActiveSubscriptionsListener;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/Settings/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 82537d48..3974c8df 100644
--- a/Settings/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/Settings/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -51,7 +51,7 @@ import com.android.ims.ImsConfig;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
diff --git a/Settings/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/Settings/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
index 4272ab7d..2d58c5ee 100644
--- a/Settings/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
+++ b/Settings/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
@@ -43,7 +43,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.ims.WifiCallingQueryImsState;
import com.android.settings.slices.SliceBroadcastReceiver;
diff --git a/Settings/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/Settings/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index 343d82e8..4a367f7d 100644
--- a/Settings/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/Settings/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -46,7 +46,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.network.telephony.MobileNetworkUtils;
diff --git a/Settings/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java b/Settings/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java
index 8226bc07..cdd40d88 100644
--- a/Settings/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java
+++ b/Settings/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java
@@ -18,7 +18,7 @@ package com.android.settings.wifi.details2;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.wifitrackerlib.WifiEntry;
diff --git a/Settings/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/Settings/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index a4b123df..2777c7b7 100644
--- a/Settings/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/Settings/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -65,7 +65,7 @@ import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
import com.android.net.module.util.Inet4AddressUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.SubscriptionUtil;
diff --git a/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt b/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
index e41863cd..b0c07f29 100644
--- a/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
+++ b/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
@@ -42,7 +42,7 @@ import androidx.compose.ui.res.stringArrayResource
import androidx.compose.ui.res.stringResource
import androidx.navigation.NavType
import androidx.navigation.navArgument
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.theme.SettingsDimension
diff --git a/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController.kt b/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController.kt
index 42741e31..4028155e 100644
--- a/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController.kt
+++ b/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController.kt
@@ -23,7 +23,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
import com.android.settings.spa.preference.ComposePreferenceController
import com.android.settingslib.spa.widget.preference.Preference
diff --git a/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
index 5d393e54..dde52c1a 100644
--- a/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
+++ b/Settings/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.wifi.flags.Flags;
import com.android.wifitrackerlib.WifiEntry;
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
index 5d393efa..c0511e6d 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
@@ -39,7 +39,7 @@ import android.widget.ImageView;
import androidx.lifecycle.ViewModelProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.template.FooterButton;
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
index 744cfc0e..b4806ef9 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import androidx.fragment.app.FragmentManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.core.InstrumentedActivity;
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
index a257c2ac..930256d9 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
@@ -26,7 +26,7 @@ import android.view.ViewGroup;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* After a camera APP scanned a Wi-Fi DPP QR code, it can trigger
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
index a7527d73..50f42e97 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
@@ -34,7 +34,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentTransaction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import java.util.List;
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppConfiguratorAuthActivity.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppConfiguratorAuthActivity.java
index 010607ff..1fa58635 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppConfiguratorAuthActivity.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppConfiguratorAuthActivity.java
@@ -30,7 +30,7 @@ import androidx.activity.result.ActivityResult;
import androidx.activity.result.contract.ActivityResultContracts;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedActivity;
/**
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
index 3ce244ce..ea1fdf91 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
@@ -24,7 +24,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentTransaction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.wifi.WifiRestrictionsCache;
/**
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index 210e94cb..fca4cf1b 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -44,7 +44,7 @@ import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.chooser.DisplayResolveInfo;
import com.android.internal.app.chooser.TargetInfo;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.qrcode.QrCodeGenerator;
import com.google.zxing.WriterException;
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index 479c81da..4e738f49 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -55,7 +55,7 @@ import androidx.annotation.UiThread;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.ViewModelProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.qrcode.QrCamera;
import com.android.settingslib.qrcode.QrDecorateView;
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/Settings/src/com/android/settings/wifi/dpp/WifiDppUtils.java
index 23a6a542..8ccdea0f 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiDppUtils.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiDppUtils.java
@@ -34,7 +34,7 @@ import android.security.keystore.KeyGenParameterSpec;
import android.security.keystore.KeyProperties;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.wifitrackerlib.WifiEntry;
diff --git a/Settings/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java b/Settings/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
index 7ede3a66..deb4eb33 100644
--- a/Settings/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
+++ b/Settings/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
@@ -36,7 +36,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.wifi.AddNetworkFragment;
diff --git a/Settings/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/Settings/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
index 3f486f20..31924238 100644
--- a/Settings/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
+++ b/Settings/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
@@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
public class WifiP2pPeer extends Preference {
diff --git a/Settings/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/Settings/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
index 5d73fa46..71e05f65 100644
--- a/Settings/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/Settings/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 1a268f51..12127810 100644
--- a/Settings/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/Settings/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -56,7 +56,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/src/com/android/settings/wifi/repository/WifiHotspotRepository.java b/Settings/src/com/android/settings/wifi/repository/WifiHotspotRepository.java
index 6140d714..04add9a6 100644
--- a/Settings/src/com/android/settings/wifi/repository/WifiHotspotRepository.java
+++ b/Settings/src/com/android/settings/wifi/repository/WifiHotspotRepository.java
@@ -40,7 +40,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import java.util.HashMap;
diff --git a/Settings/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java b/Settings/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
index 21cc1e05..7209081f 100644
--- a/Settings/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
+++ b/Settings/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
@@ -34,7 +34,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.NetworkProviderSettings;
diff --git a/Settings/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java b/Settings/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
index 779a57e4..30d0aca5 100644
--- a/Settings/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
+++ b/Settings/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
@@ -24,7 +24,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settings.wifi.WifiDialogActivity;
import com.android.wifitrackerlib.WifiEntry;
diff --git a/Settings/src/com/android/settings/wifi/slice/WifiSlice.java b/Settings/src/com/android/settings/wifi/slice/WifiSlice.java
index f75fe119..f39fed82 100644
--- a/Settings/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/Settings/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -47,7 +47,7 @@ import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java b/Settings/src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java
index 9489e118..68b420cc 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java b/Settings/src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java
index 08afde11..62a75e29 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java
@@ -26,7 +26,7 @@ import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java b/Settings/src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java
index ddf8d3fa..fb5bc445 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java
@@ -30,7 +30,7 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Observer;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.repository.WifiHotspotRepository;
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceController.java b/Settings/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceController.java
index c6a0a9f5..f9ea6e17 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceController.java
@@ -20,7 +20,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
/**
* Shows hotspot footer information.
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java b/Settings/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
index 7f386fde..41918e1d 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
/**
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/Settings/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index d61b3d04..73d82d67 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.EditTextPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.ValidatedEditTextPreference;
import com.android.settings.wifi.WifiUtils;
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/Settings/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index 0baac2c0..322d3917 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -31,7 +31,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.tether.TetheringManagerModel;
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/Settings/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
index 6f59411c..a38ef437 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
@@ -27,7 +27,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import java.util.LinkedHashMap;
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/Settings/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index bad29eb7..2bb1c21c 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -36,7 +36,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.overlay.FeatureFactory;
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java b/Settings/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
index e5d3b3d0..892714ee 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
@@ -28,7 +28,7 @@ import androidx.annotation.DrawableRes;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.ValidatedEditTextPreference;
/**
diff --git a/Settings/src/com/android/settings/wifi/tether/WifiTetherViewModel.java b/Settings/src/com/android/settings/wifi/tether/WifiTetherViewModel.java
index ea09482f..c0931b79 100644
--- a/Settings/src/com/android/settings/wifi/tether/WifiTetherViewModel.java
+++ b/Settings/src/com/android/settings/wifi/tether/WifiTetherViewModel.java
@@ -36,7 +36,7 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Observer;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.factory.WifiFeatureProvider;
import com.android.settings.wifi.repository.SharedConnectivityRepository;
diff --git a/Settings/src/com/cariad/cea/settings/MyMainActivity.kt b/Settings/src/com/cariad/cea/settings/MyMainActivity.kt
new file mode 100644
index 00000000..03291c75
--- /dev/null
+++ b/Settings/src/com/cariad/cea/settings/MyMainActivity.kt
@@ -0,0 +1,20 @@
+package com.cariad.cea.settings
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+class MyMainActivity : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ enableEdgeToEdge()
+ setContentView(R.layout.activity_my_main)
+ ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)!!) { v, insets ->
+ val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+ v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+ insets
+ }
+ }
+}
\ No newline at end of file
diff --git a/Settings/tests/componenttests/src/com/android/settings/wifi/WifiSettings2ActivityTest.java b/Settings/tests/componenttests/src/com/android/settings/wifi/WifiSettings2ActivityTest.java
index b13a57a8..e6db16ee 100644
--- a/Settings/tests/componenttests/src/com/android/settings/wifi/WifiSettings2ActivityTest.java
+++ b/Settings/tests/componenttests/src/com/android/settings/wifi/WifiSettings2ActivityTest.java
@@ -35,7 +35,7 @@ import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
import androidx.test.runner.lifecycle.Stage;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings.NetworkProviderSettingsActivity;
import com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceControllerComponentTest;
import com.android.settings.network.NetworkProviderSettings;
diff --git a/Settings/tests/legacy_unit/src/com/android/settings/dashboard/PreferenceThemeTest.java b/Settings/tests/legacy_unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
index 0ae5597f..34877cbc 100644
--- a/Settings/tests/legacy_unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
+++ b/Settings/tests/legacy_unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
@@ -32,7 +32,7 @@ import androidx.test.espresso.matcher.ViewMatchers.Visibility;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/Settings/tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
index 037c8059..3bbee256 100644
--- a/Settings/tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
+++ b/Settings/tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
@@ -43,7 +43,7 @@ import androidx.test.filters.MediumTest;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.setupcompat.PartnerCustomizationLayout;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
index f6954d27..e677150e 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
@@ -31,7 +31,7 @@ import android.text.Html;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java
index e9e20a4c..cb0670b6 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java
@@ -34,7 +34,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreferenceControllerTest.java
index ded9bcc9..d36a31ed 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreferenceControllerTest.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.search.SearchIndexableRaw;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java
index a2b27136..ab6c21ab 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java
@@ -33,7 +33,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.IllustrationPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragmentTest.java
index 97407bbf..d459d710 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java
index 5cf4d946..d99c1e0b 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
index bb153783..b3ea29d7 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
@@ -35,7 +35,7 @@ import android.content.Intent;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java
index e5e89501..cf799370 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java
@@ -27,7 +27,7 @@ import android.telephony.TelephonyManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityLayerDrawableTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityLayerDrawableTest.java
index 1dfd4092..f11b2726 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityLayerDrawableTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityLayerDrawableTest.java
@@ -23,7 +23,7 @@ import android.graphics.drawable.Drawable;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.ImageTestUtils;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java
index b13d0e46..58a54ad3 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java
@@ -36,7 +36,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settingslib.PrimarySwitchPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindowTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindowTest.java
index 104b9f87..35dd7d91 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindowTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindowTest.java
@@ -29,7 +29,7 @@ import android.widget.PopupWindow;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java
index 78c88803..02837ab8 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java
@@ -44,7 +44,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedPreference;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 05e56ca7..a5132fef 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -46,7 +46,7 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.internal.accessibility.util.AccessibilityUtils;
import com.android.internal.content.PackageMonitor;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowApplicationPackageManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
index 9f0b0465..f99f9d20 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java
index 1e0dbf25..ef8b4456 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java
@@ -23,7 +23,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
index 78256774..a0142208 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
@@ -29,7 +29,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ArrowPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ArrowPreferenceTest.java
index ff4a7483..c70b7362 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ArrowPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ArrowPreferenceTest.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AudioAdjustmentFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AudioAdjustmentFragmentTest.java
index 6eec3a98..c5f993e2 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AudioAdjustmentFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AudioAdjustmentFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java
index 4b20c961..c6b0d5ec 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/AutoclickUtilsTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/AutoclickUtilsTest.java
index a87c03f7..1cde3a3c 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/AutoclickUtilsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/AutoclickUtilsTest.java
@@ -25,7 +25,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/BackgroundPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/BackgroundPreferenceTest.java
index 007d6645..994c65ac 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/BackgroundPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/BackgroundPreferenceTest.java
@@ -27,7 +27,7 @@ import android.widget.LinearLayout;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceControllerTest.java
index 02ab32d6..9166f04c 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.After;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java
index c1a1799b..2197061a 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java
@@ -34,7 +34,7 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.SubtitleView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearanceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearanceFragmentTest.java
index c839a017..28e45fb5 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearanceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearanceFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java
index 74fb4403..8f15d6b8 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java
@@ -24,7 +24,7 @@ import android.view.accessibility.CaptioningManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java
index 8aeb37ef..07d01972 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningLocalePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningLocalePreferenceControllerTest.java
index 97c1908f..2bc42d33 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningLocalePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningLocalePreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningMoreOptionsFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningMoreOptionsFragmentTest.java
index 6969472b..1a74a60a 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningMoreOptionsFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningMoreOptionsFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java
index 5ff00e2f..d41a4bfc 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningPropertiesFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningPropertiesFragmentTest.java
index 4f25139c..39856b36 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningPropertiesFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningPropertiesFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java
index 4d33fb3b..fc48b96c 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java
index f916778d..7005d1fa 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java
@@ -32,7 +32,7 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java
index d3f54575..3c7380fe 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java
@@ -29,7 +29,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ColorContrastFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ColorContrastFragmentTest.java
index 3077637a..a44c7868 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ColorContrastFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ColorContrastFragmentTest.java
@@ -27,7 +27,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java
index 52905fca..a1d764a7 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java
@@ -25,7 +25,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java
index d967b985..0977c5f9 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java
@@ -33,7 +33,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java
index d41f2959..7a2be78e 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java
@@ -25,7 +25,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java
index 9117d514..930307ef 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java
@@ -32,7 +32,7 @@ import android.widget.TextView;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.SubtitleView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceControllerTest.java
index d4251ac8..47f3f93d 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceControllerTest.java
@@ -25,7 +25,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.After;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragmentTest.java
index ac6953dc..26b9ca70 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragmentTest.java
@@ -27,7 +27,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java
index fac467d1..3e2d98bb 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java
@@ -27,7 +27,7 @@ import androidx.annotation.ColorInt;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.Utils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java
index d082b1fe..1161a9cf 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java
@@ -38,7 +38,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.bluetooth.BluetoothPairingDetail;
import com.android.settings.bluetooth.HearingAidPairingDialogFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/HearingDeviceAudioRoutingBasePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/HearingDeviceAudioRoutingBasePreferenceControllerTest.java
index 4decf68d..9988d393 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/HearingDeviceAudioRoutingBasePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/HearingDeviceAudioRoutingBasePreferenceControllerTest.java
@@ -37,7 +37,7 @@ import android.media.audiopolicy.AudioProductStrategy;
import androidx.preference.ListPreference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/HtmlTextPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/HtmlTextPreferenceTest.java
index 63c7da16..b3934681 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/HtmlTextPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/HtmlTextPreferenceTest.java
@@ -26,7 +26,7 @@ import android.view.View;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
index 832a3136..18577ba8 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
@@ -41,7 +41,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java
index 8d5724bb..dfa10a36 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java
@@ -34,7 +34,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/LiveCaptionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/LiveCaptionPreferenceControllerTest.java
index a7a7f8f0..82b2f070 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/LiveCaptionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/LiveCaptionPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java
index b0d03564..c5c2af41 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
index 62ff39b0..0c908262 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
@@ -43,7 +43,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.DialogCreatable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.utils.AnnotationSpan;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
index 355e8c32..6d58a32b 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.core.BasePreferenceController;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.widget.SeekBarPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
index 501bbb0e..22ced7f5 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
@@ -33,7 +33,7 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationTogglePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationTogglePreferenceControllerTest.java
index 28244e51..e174c0bb 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationTogglePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationTogglePreferenceControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
index 759b1802..90774985 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
@@ -26,7 +26,7 @@ import android.view.ViewGroup;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
index 14306e02..75229a9a 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
@@ -44,7 +44,7 @@ import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.widget.LabeledSeekBarPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java
index 06a6a9c7..f26e195b 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragmentTest.java
index f3fa69dd..e34124c0 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragmentTest.java
@@ -42,7 +42,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.testing.FragmentScenario;
import androidx.lifecycle.Lifecycle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeTimer;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceControllerTest.java
index 95a9438b..58b922b9 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceControllerTest.java
@@ -39,7 +39,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.After;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
index 7482e242..05709631 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
@@ -24,7 +24,7 @@ import android.provider.Settings;
import androidx.preference.ListPreference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
index ee271fe9..2ca96e3b 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
@@ -25,7 +25,7 @@ import android.view.View;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ShortcutsSettingsFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ShortcutsSettingsFragmentTest.java
index 8505f89b..fc3f1ce4 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ShortcutsSettingsFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ShortcutsSettingsFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java
index 506882b4..73d6e6c0 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowKeyCharacterMap;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/TapAssistanceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/TapAssistanceFragmentTest.java
index a1054dad..b697bb6b 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/TapAssistanceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/TapAssistanceFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java
index 41502b31..a9e45b41 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java
@@ -35,7 +35,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.LifecycleOwner;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.LayoutPreference;
import com.google.android.setupcompat.template.FooterBarMixin;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java
index 8212ba2d..ee3c0638 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java
@@ -36,7 +36,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.preference.PreferenceManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums;
import com.android.settings.accessibility.TextReadingResetController.ResetStateListener;
import com.android.settings.testutils.XmlTestUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreviewPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreviewPreferenceTest.java
index 4ca1dca3..85b00b0e 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreviewPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingPreviewPreferenceTest.java
@@ -35,7 +35,7 @@ import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
import androidx.viewpager.widget.ViewPager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.display.PreviewPagerAdapter;
import org.junit.Assume;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingResetPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingResetPreferenceTest.java
index 374766f7..676d290d 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingResetPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/TextReadingResetPreferenceTest.java
@@ -26,7 +26,7 @@ import android.widget.FrameLayout;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
index 31741012..eee4f12d 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
@@ -47,7 +47,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarControllerTest.java
index 6f0b1571..fef3a9aa 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarControllerTest.java
@@ -41,7 +41,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragmentTest.java
index 4e8ce961..865bec4e 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragmentTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
index 9155113d..e3c866ee 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
@@ -42,7 +42,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
index 94db63b6..ad7377b4 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
@@ -46,7 +46,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 70c7cd6f..ea7ebf06 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -52,7 +52,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java
index f26e8383..376aaade 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java
@@ -35,7 +35,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment;
import com.android.settings.widget.SettingsMainSwitchBar;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 4c493955..abdac2ee 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -51,7 +51,7 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.server.accessibility.Flags;
import com.android.settings.DialogCreatable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
import com.android.settings.testutils.shadow.ShadowStorageManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java
index fa3fc239..5dd7ee1e 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java
@@ -34,7 +34,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.widget.SettingsMainSwitchBar;
import com.android.settings.widget.SettingsMainSwitchPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java
index ed426f9a..98355c4e 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java
@@ -34,7 +34,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.widget.SettingsMainSwitchBar;
import com.android.settings.widget.SettingsMainSwitchPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java
index 1249894d..b7745f67 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.content.res.Resources;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationIntensitySettingsFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationIntensitySettingsFragmentTest.java
index 045c9dbc..c6fb1056 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationIntensitySettingsFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationIntensitySettingsFragmentTest.java
@@ -29,7 +29,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
index cf33173e..e5de4bef 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
@@ -38,7 +38,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationSettingsTest.java
index f5ea39e5..0ffc14f1 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/VibrationSettingsTest.java
@@ -29,7 +29,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
index 56486d2a..219695ef 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
@@ -53,7 +53,7 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.internal.accessibility.common.ShortcutConstants;
import com.android.internal.accessibility.dialog.AccessibilityTarget;
import com.android.internal.accessibility.util.ShortcutUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
import com.android.settings.accessibility.AccessibilityUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/FloatingButtonShortcutOptionControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/FloatingButtonShortcutOptionControllerTest.java
index b39aa226..6d9b8913 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/FloatingButtonShortcutOptionControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/FloatingButtonShortcutOptionControllerTest.java
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
index 010386cf..eb05fe76 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.AccessibilityTestUtils;
import com.android.settings.testutils.shadow.SettingsShadowResources;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/NavButtonShortcutOptionControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/NavButtonShortcutOptionControllerTest.java
index 9106d005..b20d57fd 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/NavButtonShortcutOptionControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/NavButtonShortcutOptionControllerTest.java
@@ -27,7 +27,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.AccessibilityTestUtils;
import com.android.settings.testutils.shadow.SettingsShadowResources;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceTest.java
index 981b86d0..64816329 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceTest.java
@@ -26,7 +26,7 @@ import android.widget.ImageView;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
@@ -71,7 +71,7 @@ public class ShortcutOptionPreferenceTest {
@Test
public void bindViewHolder_imageRawResIdSet_shouldShowImageView() {
mShortcutOptionPreference.setIntroImageRawResId(
- com.android.settings.R.raw.accessibility_color_inversion_banner);
+ com.cariad.cea.settings.R.raw.accessibility_color_inversion_banner);
mShortcutOptionPreference.onBindViewHolder(mViewHolder);
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
index 1f7e0196..c3bed111 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
@@ -43,7 +43,7 @@ import androidx.fragment.app.FragmentActivity;
import com.android.internal.accessibility.common.ShortcutConstants;
import com.android.internal.accessibility.util.ShortcutUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
import com.android.settings.accessibility.AccessibilityButtonFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
index 800640a8..cb664496 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionControllerTest.java
index d27560b3..582e72d7 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionControllerTest.java
@@ -32,7 +32,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.server.accessibility.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
index 48a90a7e..c68cd524 100644
--- a/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
@@ -27,7 +27,7 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.internal.accessibility.common.ShortcutConstants;
import com.android.internal.accessibility.util.ShortcutUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
index 94d150d6..e588a4fa 100644
--- a/Settings/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
@@ -34,7 +34,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowAuthenticationHelper;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index cab1811d..4ac94702 100644
--- a/Settings/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -44,7 +44,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import com.android.settings.AccessiblePreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.testutils.shadow.ShadowAccountManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
index 73191145..f934361f 100644
--- a/Settings/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
@@ -21,7 +21,7 @@ import static org.mockito.Mockito.verify;
import android.accounts.Account;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
index 1084102c..639c832f 100644
--- a/Settings/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.os.UserHandle;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
diff --git a/Settings/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java
index 59e656c6..01a286ed 100644
--- a/Settings/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java
@@ -38,7 +38,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
diff --git a/Settings/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index ece7ea9d..88e8395f 100644
--- a/Settings/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -37,7 +37,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
import com.android.settingslib.search.SearchIndexableRaw;
diff --git a/Settings/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index 2052f46e..e7c6960a 100644
--- a/Settings/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -47,7 +47,7 @@ import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
index 937e38d6..283da2ad 100644
--- a/Settings/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java b/Settings/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
index 61dd569c..9f6ca805 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
@@ -51,7 +51,7 @@ import android.os.UserManager;
import android.widget.CompoundButton;
import android.widget.Switch;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppStateNotificationBridge.NotificationsSentState;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
index 49d4aac9..75a8f775 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
@@ -9,7 +9,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/ClonedAppsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/ClonedAppsPreferenceControllerTest.java
index 56117d19..9e154b79 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/ClonedAppsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/ClonedAppsPreferenceControllerTest.java
@@ -31,7 +31,7 @@ import android.provider.DeviceConfig;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/OpenSupportedLinksTest.java b/Settings/tests/robotests/src/com/android/settings/applications/OpenSupportedLinksTest.java
index 355b5db5..7723f003 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/OpenSupportedLinksTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/OpenSupportedLinksTest.java
@@ -36,7 +36,7 @@ import android.util.ArraySet;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
index 6fc01fc5..b868c86a 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
@@ -56,7 +56,7 @@ import android.view.View;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
index 922e2e80..df9cbb52 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
@@ -34,7 +34,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowSettingsLibUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
index b610d8c4..bc0c8dd8 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
@@ -33,7 +33,7 @@ import android.content.pm.PackageManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
index d72e6884..9e866fb4 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
@@ -31,7 +31,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
index 74c0bb5e..348f4057 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -32,7 +32,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
index 85be59e2..c8e251ee 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
@@ -33,7 +33,7 @@ import android.content.pm.PackageManager;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
index 9d6332ec..09446239 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
@@ -48,7 +48,7 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java b/Settings/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
index 0063b54d..640ddca5 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
@@ -19,7 +19,7 @@ package com.android.settings.applications.assist;
import static com.google.common.truth.Truth.assertThat;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
index e4d3ca58..1f529525 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.TwoTargetPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
index 4d81069f..b074cbb0 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
@@ -31,7 +31,7 @@ import android.view.autofill.AutofillManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/Settings/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
index 36c0ab86..660b7693 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
@@ -23,7 +23,7 @@ import static com.android.settings.applications.manageapplications.AppFilterRegi
import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppStateUsageBridge;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/Settings/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
index 196f2068..aed9a9ac 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -53,7 +53,7 @@ import android.widget.SearchView;
import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAppUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.widget.LoadingViewController;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/PaymentSettingsEnablerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/PaymentSettingsEnablerTest.java
index 62b95d19..d69fb3d8 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/PaymentSettingsEnablerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/PaymentSettingsEnablerTest.java
@@ -25,7 +25,7 @@ import android.nfc.NfcAdapter;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java
index 61230b85..8a788f30 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java
@@ -28,7 +28,7 @@ import android.os.UserManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowApplicationPackageManager;
import com.android.settings.testutils.shadow.ShadowCrossProfileApps;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java
index 4906f4bb..c4683fb7 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.content.pm.PackageManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.core.BasePreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java
index ed4cbd1f..9faec18c 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java
index 5982413a..c39ae509 100644
--- a/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java
index 1a6537b6..6c89597a 100644
--- a/Settings/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/Settings/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
index 17f17c1a..d5b59472 100644
--- a/Settings/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
@@ -35,7 +35,7 @@ import android.content.res.Resources;
import android.os.IBinder;
import android.os.RemoteException;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java
index 610e6f85..9699fbd4 100644
--- a/Settings/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java
@@ -23,7 +23,7 @@ import android.content.Intent;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/BiometricSettingsProviderTest.kt b/Settings/tests/robotests/src/com/android/settings/biometrics/BiometricSettingsProviderTest.kt
index 152258d5..09415cfd 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/BiometricSettingsProviderTest.kt
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/BiometricSettingsProviderTest.kt
@@ -87,7 +87,7 @@ class BiometricSettingsProviderTest {
}
private fun setSupportFaceEnroll(toThis: Boolean) {
- whenever(resources.getBoolean(com.android.settings.R.bool.config_suw_support_face_enroll))
+ whenever(resources.getBoolean(com.cariad.cea.settings.R.bool.config_suw_support_face_enroll))
.thenReturn(toThis)
}
}
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/BiometricsSplitScreenDialogTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/BiometricsSplitScreenDialogTest.java
index 3aa281cd..5d642ed5 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/BiometricsSplitScreenDialogTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/BiometricsSplitScreenDialogTest.java
@@ -29,7 +29,7 @@ import android.widget.Button;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetupTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetupTest.java
index d3bbf247..a1b188c6 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetupTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetupTest.java
@@ -27,7 +27,7 @@ import static org.robolectric.RuntimeEnvironment.application;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollActivity;
import com.google.android.setupcompat.PartnerCustomizationLayout;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtilsTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtilsTest.java
index 563974d5..03ed51a5 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtilsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtilsTest.java
@@ -32,7 +32,7 @@ import android.hardware.fingerprint.FingerprintManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.ActiveUnlockTestUtils;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
index a0ef57f3..6ddb7e97 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
@@ -51,7 +51,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
import com.android.settings.password.ChooseLockSettingsHelper;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollEducationTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollEducationTest.java
index 474ea8c4..6a5321ea 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollEducationTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollEducationTest.java
@@ -39,7 +39,7 @@ import android.view.View;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java
index a56c34ca..b58e2e08 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java
@@ -60,7 +60,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java
index 9de2fc2d..370f24d1 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java
@@ -37,7 +37,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.FooterPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceControllerTest.java
index ae359725..6acd6506 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceControllerTest.java
@@ -25,7 +25,7 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.face.FaceManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.biometrics.face.FaceSettingsRemoveButtonPreferenceController.ConfirmRemoveDialog;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
index 34db4218..121fa68e 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
@@ -41,7 +41,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index 91707cd6..db2996dc 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -61,7 +61,7 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.RingProgressBar;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 68395b27..2b020232 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -54,7 +54,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
index 1aedce53..68480571 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
@@ -52,7 +52,7 @@ import androidx.annotation.Nullable;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.VerifyCredentialResponse;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.biometrics.GatekeeperPasswordProvider;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
index c8c867c6..ea211a76 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
@@ -28,7 +28,7 @@ import android.widget.FrameLayout;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
index a9cac87c..6b5aa969 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
@@ -41,7 +41,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index 28bbb4af..2773bd91 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -32,7 +32,7 @@ import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.view.View;
import android.widget.Button;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFingerprintManager;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
index ae580d59..cb89a56a 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -26,7 +26,7 @@ import android.hardware.fingerprint.FingerprintManager;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
index fa33f9c9..8a875040 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
@@ -28,7 +28,7 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowFingerprintManager;
import com.google.android.setupcompat.PartnerCustomizationLayout;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 6b677346..a61550dd 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -35,7 +35,7 @@ import android.widget.Button;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.SetupSkipDialog;
diff --git a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt
index cea72aa7..1466d3c1 100644
--- a/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt
+++ b/Settings/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt
@@ -32,7 +32,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.runner.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.biometrics.fingerprint2.lib.model.Default
import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintNavigationStep.Introduction
import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.NavigationState
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
index d24a83b9..9ab9ac04 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
@@ -35,7 +35,7 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SettingsUIDeviceConfig;
import com.android.settings.fuelgauge.BatteryMeterView;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
index 74a5bc9a..9f99f69c 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
@@ -32,7 +32,7 @@ import android.widget.Button;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.ActionButtonsPreference;
import org.junit.Ignore;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java
index c02ec321..9c70ff65 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothDevice;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.SpacePreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.HearingAidInfo;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
index fc72c412..e515913f 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
@@ -49,7 +49,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index 03113421..5289e81e 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -35,7 +35,7 @@ import android.util.Pair;
import android.view.ContextThemeWrapper;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index 20448813..6f8edfc5 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -38,7 +38,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
index 36f01e05..8d999ff7 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.content.Intent;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.testutils.DrawableTestHelper;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java
index 3194e557..57ab58fb 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java
@@ -34,7 +34,7 @@ import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.util.DisplayMetrics;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
index f4a9d362..0aa82594 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
@@ -30,7 +30,7 @@ import androidx.slice.SliceProvider;
import androidx.slice.core.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
index 58f5a06c..827d1675 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
@@ -29,7 +29,7 @@ import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
index 853d2c48..471c5040 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.content.Context;
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.utils.AnnotationSpan;
import com.android.settings.widget.SwitchWidgetController;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/CompanionAppWidgetPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/CompanionAppWidgetPreferenceTest.java
index 8ee3ef78..2deb4abe 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/CompanionAppWidgetPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/CompanionAppWidgetPreferenceTest.java
@@ -26,7 +26,7 @@ import android.graphics.drawable.Drawable;
import android.view.ContextThemeWrapper;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.kt b/Settings/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.kt
index 0f1ad4b3..9525a8ce 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.kt
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.kt
@@ -25,7 +25,7 @@ import android.bluetooth.le.ScanFilter
import android.content.Context
import android.content.res.Resources
import androidx.preference.Preference
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter
import com.android.settingslib.bluetooth.BluetoothDeviceFilter
import com.android.settingslib.bluetooth.CachedBluetoothDevice
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
index 2394c7c9..98bd52ee 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
@@ -31,7 +31,7 @@ import android.content.Context;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
index 904d9202..9eeb81b5 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
@@ -33,7 +33,7 @@ import android.widget.EditText;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/tests/robotests/src/com/android/settings/bluetooth/RequestPermissionHelperTest.kt b/Settings/tests/robotests/src/com/android/settings/bluetooth/RequestPermissionHelperTest.kt
index e51a2f92..5a9912b1 100644
--- a/Settings/tests/robotests/src/com/android/settings/bluetooth/RequestPermissionHelperTest.kt
+++ b/Settings/tests/robotests/src/com/android/settings/bluetooth/RequestPermissionHelperTest.kt
@@ -17,7 +17,7 @@
package com.android.settings.bluetooth
import androidx.activity.ComponentActivity
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat
import com.google.common.truth.Truth.assertThat
import org.junit.After
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
index 70c73a6a..567cce16 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
@@ -34,7 +34,7 @@ import android.text.TextUtils;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
index 6ae670dc..b1f36985 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
@@ -32,7 +32,7 @@ import android.provider.Settings;
import androidx.test.core.content.pm.ApplicationInfoBuilder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.nfc.NfcPreferenceController;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
index 357420af..ed8cb854 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
@@ -44,7 +44,7 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
import com.android.settings.bluetooth.Utils;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 0cd464c8..bc890b4a 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -32,7 +32,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.connecteddevice.fastpair.FastPairDeviceUpdater;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerListHelper;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
index 6510f198..fd73ffc7 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
@@ -31,7 +31,7 @@ import android.content.pm.PackageManager;
import android.text.BidiFormatter;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.AlwaysDiscoverable;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java
index 8acb81cf..b2b20414 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java
@@ -28,7 +28,7 @@ import android.nfc.NfcAdapter;
import android.nfc.NfcManager;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
index f1cea6d7..5d99aa3a 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
@@ -42,7 +42,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.BluetoothDevicePreference;
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceDashboardFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceDashboardFragmentTest.java
index 7ac97119..f071c0d7 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceDashboardFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceDashboardFragmentTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdaterTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdaterTest.java
index afdbb8be..400846d0 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdaterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdaterTest.java
@@ -35,7 +35,7 @@ import android.hardware.input.InputManager;
import android.os.SystemClock;
import android.view.InputDevice;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
index 6c96f852..8d149547 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
@@ -57,7 +57,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreferenceCompat;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.profileselector.UserAdapter;
import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
index 3aad02e0..bd0451c2 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
@@ -35,7 +35,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
index 8d96c728..54140b8f 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
@@ -34,7 +34,7 @@ import android.content.Context;
import android.hardware.usb.UsbManager;
import android.os.UserHandle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.testutils.DrawableTestHelper;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
index 3324843f..c4732df9 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
@@ -40,7 +40,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
index 4fb78fbe..44659f9a 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
@@ -32,7 +32,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java b/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java
index 6be1bd58..59ae0652 100644
--- a/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java
@@ -41,7 +41,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
index 838edc61..2847d8ed 100644
--- a/Settings/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/core/LiveDataControllerTest.java b/Settings/tests/robotests/src/com/android/settings/core/LiveDataControllerTest.java
index 2fe54162..a430c17b 100644
--- a/Settings/tests/robotests/src/com/android/settings/core/LiveDataControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/core/LiveDataControllerTest.java
@@ -22,7 +22,7 @@ import android.content.Context;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java b/Settings/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java
index 68dfb795..1b1800b4 100644
--- a/Settings/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.slices.FakePreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/Settings/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
index f489123e..1d8fbbd3 100644
--- a/Settings/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
@@ -30,7 +30,7 @@ import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java b/Settings/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
index 4767bbc9..b0da680a 100644
--- a/Settings/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
@@ -8,7 +8,7 @@ import android.provider.SearchIndexableResource;
import android.util.AttributeSet;
import android.util.Xml;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.search.SearchFeatureProviderImpl;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/Settings/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 0799eaff..2c8a7b84 100644
--- a/Settings/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -66,7 +66,7 @@ import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.homepage.TopLevelHighlightMixin;
diff --git a/Settings/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index bedfc59b..22b878c4 100644
--- a/Settings/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -53,7 +53,7 @@ import androidx.preference.SwitchPreferenceCompat;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.slices.BlockingSlicePrefController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java b/Settings/tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java
index 2fb5e03f..0cef5f25 100644
--- a/Settings/tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java
@@ -32,7 +32,7 @@ import android.widget.TextView;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.collect.Lists;
diff --git a/Settings/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
index 205a6000..a43db1d4 100644
--- a/Settings/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
@@ -29,7 +29,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.datausage.ChartDataUsagePreference.DataUsageSummaryNode;
import com.android.settings.datausage.lib.NetworkCycleChartData;
import com.android.settings.datausage.lib.NetworkUsageData;
diff --git a/Settings/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/Settings/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 2a9cca9c..81d82096 100644
--- a/Settings/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -34,7 +34,7 @@ import android.telephony.SubscriptionManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowDashboardFragment;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index c2d0445e..be488ea0 100644
--- a/Settings/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -43,7 +43,7 @@ import android.os.UserHandle;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/datetime/LocationProviderStatusPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/datetime/LocationProviderStatusPreferenceControllerTest.java
index 9ace5638..1af07c7f 100644
--- a/Settings/tests/robotests/src/com/android/settings/datetime/LocationProviderStatusPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/datetime/LocationProviderStatusPreferenceControllerTest.java
@@ -46,7 +46,7 @@ import android.service.timezone.TimeZoneProviderStatus.DependencyStatus;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
index cd89c0c2..b18c2b15 100644
--- a/Settings/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -44,7 +44,7 @@ import android.app.time.TimeZoneDetectorStatus;
import android.content.Context;
import android.os.UserHandle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java b/Settings/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java
index 04528d00..c8e14703 100644
--- a/Settings/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java
@@ -22,7 +22,7 @@ import android.icu.text.TimeZoneFormat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.datetime.ZoneGetter;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
index dbdbf38c..c64f57e1 100644
--- a/Settings/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
@@ -9,7 +9,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.FooterPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/BluetoothLeAudioModePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/BluetoothLeAudioModePreferenceControllerTest.java
index f35fb17f..8004288a 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/BluetoothLeAudioModePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/BluetoothLeAudioModePreferenceControllerTest.java
@@ -31,7 +31,7 @@ import android.os.SystemProperties;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
index 7ab311fe..ed0a0d7a 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
@@ -33,7 +33,7 @@ import android.os.SystemProperties;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/BugReportHandlerPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/BugReportHandlerPreferenceControllerTest.java
index 6b47a808..7f66d838 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/BugReportHandlerPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/BugReportHandlerPreferenceControllerTest.java
@@ -31,7 +31,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bugreporthandler.BugReportHandlerUtil;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java b/Settings/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java
index 2d4ce432..a088b8bb 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java
@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java
index 229f2fab..efef5529 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java
@@ -30,7 +30,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentContainerView;
import androidx.test.rule.ActivityTestRule;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.security.ZygoteShadow;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index 37a4aeab..6de9cf5e 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -32,7 +32,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.widget.SettingsMainSwitchBar;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/IngressRateLimitPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/IngressRateLimitPreferenceControllerTest.java
index 0f85a140..6c65d659 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/IngressRateLimitPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/IngressRateLimitPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.net.ConnectivitySettingsManager;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/OverlayCategoryPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/OverlayCategoryPreferenceControllerTest.java
index 12f70a4a..82a254d6 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/OverlayCategoryPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/OverlayCategoryPreferenceControllerTest.java
@@ -34,7 +34,7 @@ import android.os.RemoteException;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
index b13d922f..a54cd711 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.content.pm.PackageManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
import com.android.settingslib.applications.DefaultAppInfo;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java
index f79419fd..92b4f786 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java
index 21fc6d22..93b1806d 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java
@@ -29,7 +29,7 @@ import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceTest.java
index 746c46aa..53ffb4a9 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceTest.java
index 0ab677b4..79310250 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceTest.java
index 4b8df164..aa5a434f 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceTest.java
index 1f3f08e5..e1997e5a 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceTest.java
index 10222cfc..8e1dd97d 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java b/Settings/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
index 86ceadc0..2f8ca360 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
@@ -49,7 +49,7 @@ import com.android.internal.compat.CompatibilityChangeInfo;
import com.android.internal.compat.IOverrideValidator;
import com.android.internal.compat.IPlatformCompat;
import com.android.internal.compat.OverrideAllowedState;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java b/Settings/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
index fb6c988a..3b78b0ab 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
@@ -19,7 +19,7 @@ package com.android.settings.development.featureflags;
import static com.google.common.truth.Truth.assertThat;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
index 1e154a2d..7a8bb592 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
@@ -40,7 +40,7 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java b/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
index df8a4386..c6383eaf 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
index e24b9e56..2d0b2f26 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
@@ -37,7 +37,7 @@ import android.provider.Settings;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
index 8a94aee0..9d3bd916 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
@@ -41,7 +41,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.internal.statusbar.IStatusBarService;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersDashboardTest.java b/Settings/tests/robotests/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersDashboardTest.java
index 40c34bf9..68385499 100644
--- a/Settings/tests/robotests/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersDashboardTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/development/snooplogger/SnoopLoggerFiltersDashboardTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.app.settings.SettingsEnums;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
index 93a8be2a..55054048 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
@@ -24,7 +24,7 @@ import android.os.Bundle;
import android.os.storage.VolumeInfo;
import android.widget.Button;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowStorageManager;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
index 4704475b..d3916571 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
import android.os.storage.VolumeInfo;
import android.widget.Button;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowStorageManager;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
index 984d945d..84afe49b 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
@@ -25,7 +25,7 @@ import android.widget.ProgressBar;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceControllerTest.java
index 4d1b4d03..6114fe83 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.os.BatteryManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
index 7cd67344..fdf23ab8 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
@@ -68,7 +68,7 @@ public class MainlineModuleVersionPreferenceControllerTest {
mPreference = new Preference(mContext);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext
- .getString(com.android.settings.R.string.config_mainline_module_update_package))
+ .getString(com.cariad.cea.settings.R.string.config_mainline_module_update_package))
.thenReturn(MODULE_PACKAGE);
}
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java
index 9ad5c0ee..94bd5a24 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.content.res.Resources;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java
index 47301899..06957bb7 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.content.res.Resources;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
index 96324fa5..e82c39a5 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
@@ -42,7 +42,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.deviceinfo.simstatus.SlotSimStatus;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
index 5cfe4047..4df2a72a 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
@@ -40,7 +40,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.search.SearchIndexableRaw;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index 995bef64..e7807b4c 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -42,7 +42,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.os.RoSystemProperties;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deletionhelper.ActivationWarningFragment;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index b61f5ab4..abb9c88d 100644
--- a/Settings/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -47,7 +47,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
import com.android.settings.applications.manageapplications.ManageApplications;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/AlwaysOnDisplaySliceTest.java b/Settings/tests/robotests/src/com/android/settings/display/AlwaysOnDisplaySliceTest.java
index 74e0d78d..0678ee00 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/AlwaysOnDisplaySliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/AlwaysOnDisplaySliceTest.java
@@ -36,7 +36,7 @@ import androidx.slice.SliceMetadata;
import androidx.slice.SliceProvider;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.slices.CustomSliceRegistry;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index 19eac82c..1a1dcb6a 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -183,6 +183,6 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {
final CharSequence summary = mController.getSummary();
assertThat(summary).isEqualTo(mContext.getString(
- com.android.settings.R.string.aware_summary_when_bedtime_on));
+ com.cariad.cea.settings.R.string.aware_summary_when_bedtime_on));
}
}
diff --git a/Settings/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/Settings/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
index 22e1cc30..86307610 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
@@ -34,7 +34,7 @@ import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.IconDrawableFactory;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 02291731..eed875e9 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
index 447ed2b6..9b9c7295 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java
index 03bf7636..0c27848e 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java
@@ -41,7 +41,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceControllerTest.java
index bf316e9d..9c054b82 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceControllerTest.java
@@ -41,7 +41,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.filters.SmallTest;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowThreadUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
index e5940b61..8f00beb8 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
@@ -27,7 +27,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Resources;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
index d364a3be..9c95eb39 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;
import com.android.settings.testutils.shadow.ShadowRotationPolicy;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
index ea1896e4..0c3ff68e 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
@@ -5,7 +5,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.SettingsShadowResources;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/Settings/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
index 2ae33cf7..2a44e576 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
@@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.drawer.CategoryKey;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
index 1a6a1128..fede9d9b 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -50,7 +50,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java
index 9f1b5d43..641c6c6e 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java
@@ -36,7 +36,7 @@ import android.content.res.Resources;
import android.os.UserHandle;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.ResolveInfoBuilder;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
index 3fa4582b..2d78887f 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
@@ -43,7 +43,7 @@ import android.view.View;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.ResolveInfoBuilder;
import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
index af466634..469bb7b6 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -38,7 +38,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import androidx.preference.ListPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
index 62b34e26..3401a66b 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.content.pm.ResolveInfo;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowActivityEmbeddingUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
index 32b8b66c..7003b86f 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.service.quickaccesswallet.QuickAccessWalletClient;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index 04bd4bbd..92a4fbc3 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.content.pm.ResolveInfo;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.google.common.collect.Lists;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java
index 56946c36..61c0137b 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java
@@ -34,7 +34,7 @@ import android.os.PowerManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.widget.MainSwitchPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java b/Settings/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java
index d95635e6..a1705a4a 100644
--- a/Settings/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java
@@ -38,7 +38,7 @@ import androidx.preference.DropDownPreference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.BedtimeSettingsUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/dream/DreamPickerControllerTest.java b/Settings/tests/robotests/src/com/android/settings/dream/DreamPickerControllerTest.java
index 401ffe07..6216d445 100644
--- a/Settings/tests/robotests/src/com/android/settings/dream/DreamPickerControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/dream/DreamPickerControllerTest.java
@@ -27,7 +27,7 @@ import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.dream.DreamBackend.DreamInfo;
import com.android.settingslib.widget.LayoutPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
index 56dacddd..95fe65ee 100644
--- a/Settings/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
@@ -32,7 +32,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.dream.DreamBackend.WhenToDream;
diff --git a/Settings/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
index e173add0..2e950357 100644
--- a/Settings/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.os.PowerManager;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.dream.DreamBackend.WhenToDream;
diff --git a/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
index 8d38509e..804ece3f 100644
--- a/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.content.pm.ResolveInfo;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceControllerTest.java
index cab17aba..8196690a 100644
--- a/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
index bf30ebba..72008dd0 100644
--- a/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
index f8f2ed1f..4cc359ec 100644
--- a/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
@@ -25,7 +25,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/emergency/MoreSettingsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/emergency/MoreSettingsPreferenceControllerTest.java
index 844d0ac3..34b292ad 100644
--- a/Settings/tests/robotests/src/com/android/settings/emergency/MoreSettingsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/emergency/MoreSettingsPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.content.pm.ResolveInfo;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java b/Settings/tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java
index 34b218a9..a0863d9f 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
index 6db008de..13994ad5 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
@@ -40,7 +40,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.CustomActivity;
import com.android.settings.testutils.shadow.ShadowActivity;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/Settings/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
index 1c47d914..66f3c9a4 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
@@ -26,7 +26,7 @@ import android.text.format.DateUtils;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/Settings/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index 77f5d133..034b593b 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -30,7 +30,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
index 018a64aa..0d372222 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
@@ -24,7 +24,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
index 7bb8c61f..f01c6a33 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.UserAppInfo;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
index 130b3b9a..b15f364f 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.when;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/Settings/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
index 96bfff48..2196ccbb 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
@@ -29,7 +29,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index c823c1d3..5d4ce3bd 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -30,7 +30,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 87a447d1..08dafed5 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -45,7 +45,7 @@ import android.os.UserManager;
import android.provider.Settings;
import android.text.SpannableStringBuilder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.common.collect.ImmutableList;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 5d478e7f..80da019c 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -35,7 +35,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.drawer.CategoryKey;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
index 1a16d048..f7f2155b 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
@@ -38,7 +38,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.applications.UserAppInfo;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index 02d1f643..2ae40238 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -35,7 +35,7 @@ import android.os.UserHandle;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/Settings/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
index b82919ee..5d418f7b 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
@@ -27,7 +27,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
index c9ce0607..0b4a0e43 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index a2a0de45..cac5ba9c 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.content.res.Resources;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelperTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelperTest.java
index e8a9e176..4ed58b6e 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelperTest.java
@@ -29,7 +29,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreferenceTest.java
index 2caf9fbd..efc477be 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreferenceTest.java
@@ -23,7 +23,7 @@ import android.provider.SearchIndexableResource;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacySettingsFinancedPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacySettingsFinancedPreferenceTest.java
index cefefde3..6e5047fc 100644
--- a/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacySettingsFinancedPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/enterprise/PrivacySettingsFinancedPreferenceTest.java
@@ -23,7 +23,7 @@ import android.provider.SearchIndexableResource;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java b/Settings/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
index abb88ae4..5c954893 100644
--- a/Settings/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
@@ -29,7 +29,7 @@ import androidx.slice.SliceProvider;
import androidx.slice.core.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 0648de4a..c2263154 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -47,7 +47,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.loader.app.LoaderManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry;
import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 1df8a406..b217e161 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -35,7 +35,7 @@ import android.text.TextUtils;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index 46d2d011..83c5aefa 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -30,7 +30,7 @@ import android.content.Context;
import android.content.DialogInterface;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
index 64efb6ad..aa9a2406 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -39,7 +39,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.fuelgauge.batterytip.AppInfo;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
index f7b5049c..f2cf601c 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
@@ -33,7 +33,7 @@ import android.os.BatteryManager;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.BatteryTestUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java
index f7469c73..f0d5a7b0 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.SettingsShadowResources;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
index f0805744..71c2a282 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -29,7 +29,7 @@ import android.text.format.DateUtils;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.batterytip.tips.BatteryDefenderTip;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
index a605ee32..a116990c 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
@@ -27,7 +27,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.CardPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
index 097f4840..a498b132 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
@@ -25,7 +25,7 @@ import androidx.annotation.DrawableRes;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.CardPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.testutils.DrawableTestHelper;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
index 7a23332b..9d78c582 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
@@ -27,7 +27,7 @@ import android.util.Log;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.CardPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
index 69edef79..89827824 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import android.os.Parcel;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
index c4bc3bcf..3f64b7bf 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
@@ -32,7 +32,7 @@ import android.content.pm.PackageManager;
import android.os.Parcel;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
index 4567bc39..01d5fdfc 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
@@ -34,7 +34,7 @@ import android.os.BatteryConsumer;
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
index 450d058c..0d4c46ca 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
@@ -35,7 +35,7 @@ import android.os.UidBatteryConsumer;
import android.os.UserBatteryConsumer;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batteryusage.BatteryEntry.NameAndIcon;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreferenceTest.java
index 26fff370..94106157 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreferenceTest.java
@@ -26,7 +26,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
index b0bf2415..9fad3840 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
@@ -33,7 +33,7 @@ import android.content.Intent;
import android.view.View;
import com.android.settings.DisplaySettings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java
index 879a5c1c..3e80b201 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java
@@ -26,7 +26,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.os.LocaleList;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java
index ef4460bd..8961dc70 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java
@@ -27,7 +27,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
index 19d5e593..01ecf1df 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
@@ -42,7 +42,7 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.fuelgauge.BatteryBroadcastReceiver;
import com.android.settings.fuelgauge.BatteryInfo;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreferenceTest.java
index 80509849..cfd70b0b 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreferenceTest.java
@@ -26,7 +26,7 @@ import android.widget.Spinner;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TextViewPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TextViewPreferenceTest.java
index caccc872..5fc5abd0 100644
--- a/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TextViewPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TextViewPreferenceTest.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.spy;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java
index 527ea44e..2deaa827 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
import android.content.Context;
import android.widget.ImageView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index f04505b2..2c78b142 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -31,7 +31,7 @@ import android.hardware.SensorManager;
import android.os.UserManager;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/LabeledSeekBarPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/LabeledSeekBarPreferenceTest.java
index 5262a164..9fb75773 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/LabeledSeekBarPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/LabeledSeekBarPreferenceTest.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.widget.LabeledSeekBarPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/LongPressPowerFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/LongPressPowerFooterPreferenceControllerTest.java
index e1cd53ea..f543740e 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/LongPressPowerFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/LongPressPowerFooterPreferenceControllerTest.java
@@ -30,7 +30,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.FooterPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/LongPressPowerIllustrationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/LongPressPowerIllustrationPreferenceControllerTest.java
index 37a4c0bb..87f7bb46 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/LongPressPowerIllustrationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/LongPressPowerIllustrationPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.app.Application;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.IllustrationPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
index d0f64854..4ae07432 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
@@ -22,7 +22,7 @@ import android.content.Context;
import android.os.SystemProperties;
import android.os.UserHandle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedPreferenceCategoryControllerTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedPreferenceCategoryControllerTest.java
index b3d4934a..1fb109be 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedPreferenceCategoryControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedPreferenceCategoryControllerTest.java
@@ -27,7 +27,7 @@ import android.text.TextUtils;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
index 9633b15b..0db2d494 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
@@ -27,7 +27,7 @@ import android.provider.SearchIndexableResource;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/PowerMenuPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/PowerMenuPreferenceControllerTest.java
index 0dc16ccd..8441d084 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/PowerMenuPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/PowerMenuPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.content.res.Resources;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
index 04467a4e..b7b450ed 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
@@ -37,7 +37,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.PrimarySwitchPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
index 40dc4287..12750bb3 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java
index 48cf4b31..9336cda6 100644
--- a/Settings/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java
@@ -174,16 +174,16 @@ public class SystemNavigationPreferenceControllerTest {
SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
NAV_BAR_MODE_GESTURAL);
assertThat(TextUtils.equals(mController.getSummary(), mContext.getText(
- com.android.settings.R.string.edge_to_edge_navigation_title))).isTrue();
+ com.cariad.cea.settings.R.string.edge_to_edge_navigation_title))).isTrue();
SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
NAV_BAR_MODE_3BUTTON);
assertThat(TextUtils.equals(mController.getSummary(),
- mContext.getText(com.android.settings.R.string.legacy_navigation_title))).isTrue();
+ mContext.getText(com.cariad.cea.settings.R.string.legacy_navigation_title))).isTrue();
SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
NAV_BAR_MODE_2BUTTON);
assertThat(TextUtils.equals(mController.getSummary(), mContext.getText(
- com.android.settings.R.string.swipe_up_to_switch_apps_title))).isTrue();
+ com.cariad.cea.settings.R.string.swipe_up_to_switch_apps_title))).isTrue();
}
}
\ No newline at end of file
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index 0d1ee9c7..e485946e 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -47,7 +47,7 @@ import android.widget.FrameLayout;
import androidx.fragment.app.Fragment;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.testutils.shadow.ShadowActivityEmbeddingUtils;
import com.android.settings.testutils.shadow.ShadowPasswordUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
index 44f44aa8..a2569526 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
@@ -33,7 +33,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
index 1967aef5..89f0f786 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -34,7 +34,7 @@ import android.content.Context;
import android.net.Uri;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapterTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapterTest.java
index 987aa8aa..eb33a799 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapterTest.java
@@ -27,7 +27,7 @@ import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer;
import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer.ConditionalCardHolder;
import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java
index 64dbbb28..f7d0dede 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java
@@ -37,7 +37,7 @@ import androidx.slice.widget.SliceLiveData;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.slices.CustomSliceRegistry;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
index f29386f4..8820396a 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
@@ -29,7 +29,7 @@ import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java
index 02dcecd3..d7c30766 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java
@@ -28,7 +28,7 @@ import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
index dcd09638..3845d789 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
@@ -27,7 +27,7 @@ import android.app.NotificationManager;
import android.content.Context;
import android.service.notification.ZenModeConfig;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.testutils.shadow.ShadowNotificationManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
index 502a62bd..256c5217 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.service.settings.suggestions.Suggestion;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java
index 65b32338..c88b828a 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java
@@ -29,7 +29,7 @@ import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
index b09fa7d8..a857358c 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
@@ -45,7 +45,7 @@ import androidx.slice.SliceProvider;
import androidx.slice.core.SliceQuery;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.testutils.SliceTester;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java
index 4377ec01..f37f1f3c 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java
@@ -36,7 +36,7 @@ import androidx.slice.SliceMetadata;
import androidx.slice.SliceProvider;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.SlicesFeatureProviderImpl;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java
index c8ec57aa..2ca5077e 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java
@@ -27,7 +27,7 @@ import androidx.slice.SliceMetadata;
import androidx.slice.SliceProvider;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowPrivateStorageInfo;
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java
index 8c252607..cb0d3f66 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java
@@ -34,7 +34,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.CardContentProvider;
import com.android.settings.homepage.contextualcards.CardDatabaseHelper;
import com.android.settings.homepage.contextualcards.ContextualCard;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
index 71c839dc..036270ac 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
@@ -44,7 +44,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelperTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelperTest.java
index f5df4faf..002abd1d 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelperTest.java
@@ -37,7 +37,7 @@ import androidx.slice.builders.SliceAction;
import androidx.slice.widget.SliceLiveData;
import androidx.slice.widget.SliceView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.slices.SliceFullCardRendererHelper.SliceViewHolder;
import com.android.settings.intelligence.ContextualCardProto;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelperTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelperTest.java
index a7112d26..311c79b7 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelperTest.java
@@ -36,7 +36,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.slices.SliceHalfCardRendererHelper.HalfCardViewHolder;
import com.android.settings.intelligence.ContextualCardProto;
diff --git a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegateTest.java b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegateTest.java
index 89a9ca82..dd2525e0 100644
--- a/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegateTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegateTest.java
@@ -30,7 +30,7 @@ import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer;
import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer.ConditionalCardHolder;
import com.android.settings.homepage.contextualcards.slices.SliceFullCardRendererHelper.SliceViewHolder;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragmentTest.java
index c6a5d640..71e20610 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragmentTest.java
@@ -44,7 +44,7 @@ import android.view.inputmethod.InputMethodSubtype;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java
index 2d4af3cc..2a3e8380 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java
@@ -26,7 +26,7 @@ import android.os.Bundle;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
index b050970c..19c9bca3 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
@@ -30,7 +30,7 @@ import android.view.textservice.TextServicesManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java
index fa737685..29b0494e 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceControllerTest.java
index 85d56ef8..97f2b239 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceControllerTest.java
index 6b3b3f5a..59c8fd8e 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceControllerTest.java
index 005bc9fc..124bcfeb 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceControllerTest.java
index 2ef53a67..e3ddda3f 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java
index f545c382..2b47c200 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceControllerTest.java
index 5e354d2c..05db4d72 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java
index 8e9d026d..5498db87 100644
--- a/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index 4429dd76..efc930d9 100644
--- a/Settings/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -39,7 +39,7 @@ import android.view.textservice.TextServicesManager;
import androidx.lifecycle.LifecycleObserver;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java b/Settings/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
index e51f9a3f..d3d7c9eb 100644
--- a/Settings/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
@@ -59,7 +59,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.internal.app.LocaleStore;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowActivityManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
index df9dc27e..eab83ae7 100644
--- a/Settings/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
@@ -11,7 +11,7 @@ import android.provider.Settings;
import androidx.lifecycle.LifecycleOwner;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
index 03f46638..67774726 100644
--- a/Settings/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.provider.Settings;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/location/LocationServicesTest.java b/Settings/tests/robotests/src/com/android/settings/location/LocationServicesTest.java
index f1158458..51fc315a 100644
--- a/Settings/tests/robotests/src/com/android/settings/location/LocationServicesTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/location/LocationServicesTest.java
@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/location/LocationSettingsFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/location/LocationSettingsFooterPreferenceControllerTest.java
index 333929dc..6dffd65d 100644
--- a/Settings/tests/robotests/src/com/android/settings/location/LocationSettingsFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/location/LocationSettingsFooterPreferenceControllerTest.java
@@ -41,7 +41,7 @@ import android.text.Html;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/location/LocationSliceTest.java b/Settings/tests/robotests/src/com/android/settings/location/LocationSliceTest.java
index a373b1f8..d11a60ee 100644
--- a/Settings/tests/robotests/src/com/android/settings/location/LocationSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/location/LocationSliceTest.java
@@ -11,7 +11,7 @@ import androidx.slice.SliceProvider;
import androidx.slice.core.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
index e9284ee5..644a6fb6 100644
--- a/Settings/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
import com.android.settingslib.applications.RecentAppOpsAccess;
diff --git a/Settings/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
index 15fdd890..919b931a 100644
--- a/Settings/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.location.LocationManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java b/Settings/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
index 652bd039..a5265986 100644
--- a/Settings/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
@@ -47,7 +47,7 @@ import androidx.slice.SliceMetadata;
import androidx.slice.SliceProvider;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java b/Settings/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
index 5188ad44..cb59c698 100644
--- a/Settings/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
@@ -153,7 +153,7 @@ public class RemoteMediaSliceTest {
final SliceAction primaryAction = metadata.getPrimaryAction();
assertThat(primaryAction.getTitle().toString()).isEqualTo(mContext.getText(
- com.android.settings.R.string.remote_media_volume_option_title));
+ com.cariad.cea.settings.R.string.remote_media_volume_option_title));
}
@Implements(SliceBackgroundWorker.class)
diff --git a/Settings/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java
index 9ba62385..f61e5a80 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
index fb29e059..7f56a218 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
@@ -66,7 +66,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.AirplaneModeEnabler;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.datausage.DataUsagePreference;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index 45800029..e87a881f 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -37,7 +37,7 @@ import android.widget.LinearLayout;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.CustomDialogPreferenceCompat.CustomPreferenceDialogFragment;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
index 775ac47a..59b23374 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
@@ -61,7 +61,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
index 8e0c8631..6ca11a3d 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.os.UserManager;
import android.text.BidiFormatter;
import android.util.FeatureFlagUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java b/Settings/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
index d8895d5d..d098ab49 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
@@ -51,7 +51,7 @@ import androidx.preference.ListPreference;
import androidx.preference.MultiSelectListPreference;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.apn.ApnEditor.ApnData;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java b/Settings/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
index 8445fe22..02ad4186 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
@@ -40,7 +40,7 @@ import androidx.slice.SliceProvider;
import androidx.slice.core.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
index 297815b0..6b8f2596 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.datausage.DataUsageSummaryPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
index b2920cd1..faa39f4d 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
@@ -43,7 +43,7 @@ import android.widget.Spinner;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
diff --git a/Settings/tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java
index 4e0fb03c..2502ceef 100644
--- a/Settings/tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java
@@ -53,8 +53,8 @@ import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
+import com.cariad.cea.settings.R;
+import com.cariad.cea.settings.RestrictedSettingsFragment;
import com.android.settings.wifi.tether.WifiTetherPreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java
index 56326ef1..3dcd360a 100644
--- a/Settings/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
index 9b756b0b..bcdbe2ba 100644
--- a/Settings/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.os.UserManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
index 76a64d37..73ca0cf8 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
@@ -30,7 +30,7 @@ import android.os.SystemProperties;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java
index a201fdb4..7145bdab 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
index ed65d5b9..120301d7 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.media.AudioManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
index 097aed7b..26337551 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
@@ -74,7 +74,7 @@ public class DockAudioMediaPreferenceControllerTest {
.getSystemService(Context.DEVICE_POLICY_SERVICE);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
- when(mActivity.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mActivity.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(true);
when(mActivity.getResources().getString(anyInt())).thenReturn("test string");
mPreference = new DropDownPreference(RuntimeEnvironment.application);
@@ -86,7 +86,7 @@ public class DockAudioMediaPreferenceControllerTest {
@Test
public void isAvailable_hasDockSettings_shouldReturnTrue() {
- when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mContext.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
@@ -94,7 +94,7 @@ public class DockAudioMediaPreferenceControllerTest {
@Test
public void isAvailable_noDockSettings_shouldReturnFalse() {
- when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mContext.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
@@ -104,7 +104,7 @@ public class DockAudioMediaPreferenceControllerTest {
public void isAvailable_undocked_shouldReturnFalse() {
when(mContext.registerReceiver(nullable(BroadcastReceiver.class),
any(IntentFilter.class))).thenReturn(null);
- when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mContext.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(true);
assertThat(mController.isAvailable()).isFalse();
@@ -113,7 +113,7 @@ public class DockAudioMediaPreferenceControllerTest {
@Test
public void isAvailable_highEndDock_shouldReturnFalse() {
fakeDockState(Intent.EXTRA_DOCK_STATE_HE_DESK);
- when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mContext.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(true);
assertThat(mController.isAvailable()).isFalse();
@@ -122,7 +122,7 @@ public class DockAudioMediaPreferenceControllerTest {
@Test
public void isAvailable_lowEndDock_shouldReturnTrue() {
fakeDockState(Intent.EXTRA_DOCK_STATE_LE_DESK);
- when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mContext.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
index 7aeddfca..16395af0 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
@@ -69,7 +69,7 @@ public class DockingSoundPreferenceControllerTest {
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
mPreference = new SwitchPreference(RuntimeEnvironment.application);
- when(mActivity.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mActivity.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(true);
mController = new DockingSoundPreferenceController(mContext, mSetting, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -78,7 +78,7 @@ public class DockingSoundPreferenceControllerTest {
@Test
public void isAvailable_hasDockSettings_shouldReturnTrue() {
- when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mContext.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
@@ -86,7 +86,7 @@ public class DockingSoundPreferenceControllerTest {
@Test
public void isAvailable_noDockSettings_shouldReturnFalse() {
- when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
+ when(mContext.getResources().getBoolean(com.cariad.cea.settings.R.bool.has_dock_settings))
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java
index 687ef74e..ea3ab7c5 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java
@@ -29,7 +29,7 @@ import android.view.View;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java b/Settings/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java
index 9b510fb4..b563485f 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java
@@ -31,7 +31,7 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.common.base.Strings;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
index 45a3e1f9..0c8bac65 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
@@ -95,7 +95,7 @@ public class NotificationVolumePreferenceControllerTest {
@Test
public void isAvailable_whenVoiceCapable_shouldReturnTrue() {
when(mResources.getBoolean(
- com.android.settings.R.bool.config_show_notification_volume)).thenReturn(true);
+ com.cariad.cea.settings.R.bool.config_show_notification_volume)).thenReturn(true);
NotificationVolumePreferenceController controller =
new NotificationVolumePreferenceController(mContext);
@@ -109,7 +109,7 @@ public class NotificationVolumePreferenceControllerTest {
@Test
public void isAvailable_notShowNotificationVolume_shouldReturnFalse() {
when(mResources.getBoolean(
- com.android.settings.R.bool.config_show_notification_volume)).thenReturn(false);
+ com.cariad.cea.settings.R.bool.config_show_notification_volume)).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@@ -117,7 +117,7 @@ public class NotificationVolumePreferenceControllerTest {
@Test
public void isAvailable_notSingleVolume_notVoiceCapable_shouldReturnTrue() {
when(mResources.getBoolean(
- com.android.settings.R.bool.config_show_notification_volume)).thenReturn(true);
+ com.cariad.cea.settings.R.bool.config_show_notification_volume)).thenReturn(true);
when(mHelper.isSingleVolume()).thenReturn(false);
when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
@@ -163,7 +163,7 @@ public class NotificationVolumePreferenceControllerTest {
@Test
public void ringerModeSilent_getAvailability_returnsDisabled() {
when(mResources.getBoolean(
- com.android.settings.R.bool.config_show_notification_volume)).thenReturn(true);
+ com.cariad.cea.settings.R.bool.config_show_notification_volume)).thenReturn(true);
when(mHelper.isSingleVolume()).thenReturn(false);
when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_SILENT);
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/PoliteNotificationFilterControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/PoliteNotificationFilterControllerTest.java
index 646e927c..2f4e3c66 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/PoliteNotificationFilterControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/PoliteNotificationFilterControllerTest.java
@@ -33,7 +33,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.server.notification.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java b/Settings/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java
index 9d475b84..1b147b38 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java
@@ -18,8 +18,8 @@ import android.provider.Settings;
import android.view.View;
import android.widget.RadioButton;
-import com.android.settings.R;
-import com.android.settings.RestrictedRadioButton;
+import com.cariad.cea.settings.R;
+import com.cariad.cea.settings.RestrictedRadioButton;
import com.android.settings.notification.RedactionInterstitial.RedactionInterstitialFragment;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
index 06bd90b3..d4704b21 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
@@ -41,7 +41,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java
index 567c7ff9..c1b0b397 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java
@@ -30,8 +30,8 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
-import com.android.settings.RestrictedListPreference;
+import com.cariad.cea.settings.R;
+import com.cariad.cea.settings.RestrictedListPreference;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index e7bc3295..a672e62c 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -28,7 +28,7 @@ import android.media.AudioManager;
import android.os.UserManager;
import android.preference.SeekBarVolumizer;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowAudioHelper;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/SoundWorkSettingsControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/SoundWorkSettingsControllerTest.java
index ee0a2ec0..39e815ac 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/SoundWorkSettingsControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/SoundWorkSettingsControllerTest.java
@@ -35,8 +35,8 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.settings.DefaultRingtonePreference;
-import com.android.settings.R;
-import com.android.settings.RingtonePreference;
+import com.cariad.cea.settings.R;
+import com.cariad.cea.settings.RingtonePreference;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/SwipeDirectionPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/SwipeDirectionPreferenceControllerTest.java
index 32ba5925..cb2d2fe2 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/SwipeDirectionPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/SwipeDirectionPreferenceControllerTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
index 6fbe40e2..e0a7c03f 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
@@ -45,7 +45,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
index 178aee5f..8ede5ee2 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
@@ -33,7 +33,7 @@ import android.view.View;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java
index c5733bff..0c9a84e3 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/app/NotificationsOffPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/app/NotificationsOffPreferenceControllerTest.java
index 2eebd3a2..2bd3a4a1 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/app/NotificationsOffPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/app/NotificationsOffPreferenceControllerTest.java
@@ -33,7 +33,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.google.common.collect.ImmutableList;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
index 3c0a0f33..45ae9f97 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
@@ -47,7 +47,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.widget.LayoutPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/app/VisibilityPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/app/VisibilityPreferenceControllerTest.java
index a0612086..92d8bc95 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/app/VisibilityPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/app/VisibilityPreferenceControllerTest.java
@@ -46,7 +46,7 @@ import android.os.UserManager;
import android.provider.Settings;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.RestrictedListPreference;
+import com.cariad.cea.settings.RestrictedListPreference;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.testutils.shadow.ShadowRestrictionUtils;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenFooterPreferenceControllerTest.java
index 90f56f4c..904e24e4 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenFooterPreferenceControllerTest.java
@@ -37,7 +37,7 @@ import android.content.Context;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.zen.ZenFooterPreferenceController;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
index fd795155..16c166ad 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
@@ -41,7 +41,7 @@ import android.util.ArrayMap;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.zen.AbstractZenModePreferenceController.ZenModeConfigWrapper;
import com.android.settings.notification.zen.ZenModeBehaviorFooterPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -149,7 +149,7 @@ public class ZenModeBehaviorFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_qs_set_behavior));
+ com.cariad.cea.settings.R.string.zen_mode_qs_set_behavior));
}
@Test
@@ -165,7 +165,7 @@ public class ZenModeBehaviorFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
+ com.cariad.cea.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
}
@Test
@@ -179,7 +179,7 @@ public class ZenModeBehaviorFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_qs_set_behavior));
+ com.cariad.cea.settings.R.string.zen_mode_qs_set_behavior));
}
@Test
@@ -195,7 +195,7 @@ public class ZenModeBehaviorFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
+ com.cariad.cea.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
}
@Test
@@ -215,7 +215,7 @@ public class ZenModeBehaviorFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
+ com.cariad.cea.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
}
@Test
@@ -235,6 +235,6 @@ public class ZenModeBehaviorFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
+ com.cariad.cea.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
}
}
\ No newline at end of file
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
index 11e85481..0ed3fb0e 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
@@ -25,7 +25,7 @@ import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeDurationPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java
index f6df04d2..84cdb675 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java
@@ -31,7 +31,7 @@ import android.os.Looper;
import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettingsTest.java
index 4361eb3d..83439b49 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettingsTest.java
@@ -31,7 +31,7 @@ import android.os.Looper;
import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java
index efa2f558..f6ffb7b6 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java
@@ -133,7 +133,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_settings_dnd_automatic_rule_app,
+ com.cariad.cea.settings.R.string.zen_mode_settings_dnd_automatic_rule_app,
TEST_APP_NAME));
}
@@ -145,7 +145,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_settings_dnd_manual_end_time, placeholder));
+ com.cariad.cea.settings.R.string.zen_mode_settings_dnd_manual_end_time, placeholder));
}
@Test
@@ -155,7 +155,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_settings_dnd_manual_indefinite));
+ com.cariad.cea.settings.R.string.zen_mode_settings_dnd_manual_indefinite));
}
@Test
@@ -170,7 +170,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_settings_dnd_automatic_rule,
+ com.cariad.cea.settings.R.string.zen_mode_settings_dnd_automatic_rule,
TEST_RULE_NAME));
}
@@ -187,7 +187,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest {
// manual rule end time is after automatic rule end time, so it is displayed
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_settings_dnd_manual_indefinite));
+ com.cariad.cea.settings.R.string.zen_mode_settings_dnd_manual_indefinite));
}
@Test
@@ -204,7 +204,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest {
// automatic rule end time is after manual rule end time, so it is displayed
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_settings_dnd_automatic_rule,
+ com.cariad.cea.settings.R.string.zen_mode_settings_dnd_automatic_rule,
TEST_RULE_NAME));
}
@@ -226,7 +226,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest {
// automatic rule from app is displayed
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_settings_dnd_automatic_rule,
+ com.cariad.cea.settings.R.string.zen_mode_settings_dnd_automatic_rule,
TEST_RULE_NAME + "2"));
}
@@ -248,7 +248,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest {
// active automatic rule with the latest end time will display
verify(mockPref).setTitle(mContext.getString(
- com.android.settings.R.string.zen_mode_settings_dnd_automatic_rule,
+ com.cariad.cea.settings.R.string.zen_mode_settings_dnd_automatic_rule,
TEST_RULE_NAME + "2"));
}
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
index 27c4ec41..3dc75584 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
@@ -25,7 +25,7 @@ import android.app.NotificationManager.Policy;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.notification.zen.ZenModeSettings;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSliceBuilderTest.java b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSliceBuilderTest.java
index 3f9e4864..088befcc 100644
--- a/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSliceBuilderTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/notification/zen/ZenModeSliceBuilderTest.java
@@ -36,7 +36,7 @@ import androidx.slice.SliceProvider;
import androidx.slice.core.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowNotificationManager;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
diff --git a/Settings/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java
index 090bcfb7..3740f654 100644
--- a/Settings/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java
@@ -38,7 +38,7 @@ import android.widget.TextView;
import androidx.core.graphics.drawable.IconCompat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java b/Settings/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
index 87a798a2..6353e9b9 100644
--- a/Settings/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
@@ -45,7 +45,7 @@ import androidx.lifecycle.LiveData;
import androidx.slice.Slice;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.panel.PanelSlicesAdapter.SliceRowViewHolder;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java b/Settings/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
index e550284b..4058789d 100644
--- a/Settings/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
@@ -41,7 +41,7 @@ import androidx.core.view.WindowInsetsControllerCompat;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 996d5722..a5341eaf 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -43,7 +43,7 @@ import android.app.admin.PasswordPolicy;
import android.os.UserHandle;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
index e7e0b921..08d6acf6 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -61,7 +61,7 @@ import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index dea936d1..0fec56df 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -48,7 +48,7 @@ import android.widget.CheckBox;
import android.widget.TextView;
import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment;
import com.android.settings.password.ChooseLockPassword.IntentBuilder;
import com.android.settings.testutils.shadow.SettingsShadowResources;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index 7715c62b..d6b6d2b9 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -32,7 +32,7 @@ import android.view.View;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
import com.android.settings.password.ChooseLockPattern.IntentBuilder;
import com.android.settings.testutils.shadow.ShadowUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
index a7c71ad9..f7d39f24 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
@@ -30,7 +30,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/ConfirmLockPasswordTest.java b/Settings/tests/robotests/src/com/android/settings/password/ConfirmLockPasswordTest.java
index 4ac375fe..2ad4a118 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/ConfirmLockPasswordTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/ConfirmLockPasswordTest.java
@@ -54,7 +54,7 @@ import android.widget.ImeAwareEditText;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/ConfirmLockPatternTest.java b/Settings/tests/robotests/src/com/android/settings/password/ConfirmLockPatternTest.java
index 04a76b85..0fe8e9f0 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/ConfirmLockPatternTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/ConfirmLockPatternTest.java
@@ -50,7 +50,7 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java b/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java
index c23ce9be..ba0e99de 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java
@@ -37,7 +37,7 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index e207d241..3f097aaf 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -30,7 +30,7 @@ import android.widget.LinearLayout;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.Stage;
import com.android.settings.password.ChooseLockPassword.IntentBuilder;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index ce47a9e9..42e39e5e 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -38,7 +38,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockPatternView.DisplayMode;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
import com.android.settings.password.ChooseLockPattern.IntentBuilder;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/Settings/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
index 53a80dc4..e9fb77da 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
@@ -31,7 +31,7 @@ import android.hardware.fingerprint.FingerprintManager;
import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/password/TestUtils.java b/Settings/tests/robotests/src/com/android/settings/password/TestUtils.java
index ef08f054..f098df33 100644
--- a/Settings/tests/robotests/src/com/android/settings/password/TestUtils.java
+++ b/Settings/tests/robotests/src/com/android/settings/password/TestUtils.java
@@ -26,7 +26,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.ServiceInfo;
import com.android.security.SecureBox;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.robolectric.Robolectric;
diff --git a/Settings/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
index da4d58c7..9b102412 100644
--- a/Settings/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
@@ -36,7 +36,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
index a6c99559..7b5eabae 100644
--- a/Settings/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
@@ -40,7 +40,7 @@ import android.printservice.PrintServiceInfo;
import androidx.lifecycle.LifecycleOwner;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingTest.kt b/Settings/tests/robotests/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingTest.kt
index 3d42f23b..2bf8e9e3 100644
--- a/Settings/tests/robotests/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingTest.kt
+++ b/Settings/tests/robotests/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingTest.kt
@@ -21,7 +21,7 @@ import androidx.fragment.app.testing.launchFragmentInContainer
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
-import com.android.settings.R
+import com.cariad.cea.settings.R
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/robotests/src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinishTest.kt b/Settings/tests/robotests/src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinishTest.kt
index 46ff19c8..93d626f8 100644
--- a/Settings/tests/robotests/src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinishTest.kt
+++ b/Settings/tests/robotests/src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinishTest.kt
@@ -21,7 +21,7 @@ import androidx.fragment.app.testing.launchFragmentInContainer
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
-import com.android.settings.R
+import com.cariad.cea.settings.R
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/robotests/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroductionTest.kt b/Settings/tests/robotests/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroductionTest.kt
index 6855e9f0..e3772f95 100644
--- a/Settings/tests/robotests/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroductionTest.kt
+++ b/Settings/tests/robotests/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroductionTest.kt
@@ -21,7 +21,7 @@ import androidx.fragment.app.testing.launchFragmentInContainer
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
-import com.android.settings.R
+import com.cariad.cea.settings.R
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/robotests/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsTest.kt b/Settings/tests/robotests/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsTest.kt
index 9b168135..12ad6bc5 100644
--- a/Settings/tests/robotests/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsTest.kt
+++ b/Settings/tests/robotests/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsTest.kt
@@ -21,7 +21,7 @@ import androidx.fragment.app.testing.launchFragmentInContainer
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
-import com.android.settings.R
+import com.cariad.cea.settings.R
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/Settings/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index 09b1ea94..6702c987 100644
--- a/Settings/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.spy;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java b/Settings/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java
index 7a229f68..ab5a54c3 100644
--- a/Settings/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java
+++ b/Settings/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java
@@ -62,7 +62,7 @@ public class FakeSettingsFragment extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
- return com.android.settings.R.xml.display_settings;
+ return com.cariad.cea.settings.R.xml.display_settings;
}
@Override
@@ -102,7 +102,7 @@ public class FakeSettingsFragment extends DashboardFragment {
final ArrayList result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = com.android.settings.R.xml.display_settings;
+ sir.xmlResId = com.cariad.cea.settings.R.xml.display_settings;
result.add(sir);
return result;
}
diff --git a/Settings/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/Settings/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index 8a7419bb..af854934 100644
--- a/Settings/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -29,7 +29,7 @@ import android.widget.Toolbar;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/Settings/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index 5de64b53..391d6f5d 100644
--- a/Settings/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -18,7 +18,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.provider.SearchIndexablesContract;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accounts.ManagedProfileSettings;
import com.android.settings.dashboard.CategoryManager;
import com.android.settings.homepage.TopLevelSettings;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
index 60df553c..826afe2c 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
@@ -35,7 +35,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/ContentProtectionPreferenceFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/security/ContentProtectionPreferenceFragmentTest.java
index d3945822..df941dfa 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/ContentProtectionPreferenceFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/ContentProtectionPreferenceFragmentTest.java
@@ -33,7 +33,7 @@ import android.view.contentcapture.ContentCaptureManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowDashboardFragment;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/CredentialManagementAppControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/CredentialManagementAppControllerTest.java
index eb7165e5..9a542cdf 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/CredentialManagementAppControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/CredentialManagementAppControllerTest.java
@@ -24,7 +24,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/CredentialManagementAppFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/security/CredentialManagementAppFragmentTest.java
index de19e5cc..849e5fd6 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/CredentialManagementAppFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/CredentialManagementAppFragmentTest.java
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.spy;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowDashboardFragment;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/Settings/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
index 446fd6cc..661278d3 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
@@ -80,7 +80,7 @@ public class EncryptionAndCredentialTest {
public static class TestFragment extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- addPreferencesFromResource(com.android.settings.R.xml.encryption_and_credential);
+ addPreferencesFromResource(com.cariad.cea.settings.R.xml.encryption_and_credential);
}
}
}
diff --git a/Settings/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
index 410198bf..b68e2c5c 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.content.Context;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/MemtagHelperTest.java b/Settings/tests/robotests/src/com/android/settings/security/MemtagHelperTest.java
index e3be8e2b..1235b8cf 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/MemtagHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/MemtagHelperTest.java
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.os.SystemProperties;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/MemtagPageTest.java b/Settings/tests/robotests/src/com/android/settings/security/MemtagPageTest.java
index a4fd21b4..4bb71deb 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/MemtagPageTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/MemtagPageTest.java
@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java
index cca88dd7..b65f4b21 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java
@@ -28,7 +28,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
index 81f4fce1..15769630 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
@@ -147,7 +147,7 @@ public class OwnerInfoPreferenceControllerTest {
mController.updateSummary();
verify(mPreference).setSummary(mContext.getString(
- com.android.settings.R.string.owner_info_settings_summary));
+ com.cariad.cea.settings.R.string.owner_info_settings_summary));
}
@Test
diff --git a/Settings/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java b/Settings/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java
index aacbf0ce..4c8ddcf0 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java
@@ -38,7 +38,7 @@ import android.widget.LinearLayout;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
index 4f694bc8..7852a6e8 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
@@ -24,7 +24,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.After;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/ScreenPinningSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/security/ScreenPinningSettingsTest.java
index 045ef65b..cae69b6d 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/ScreenPinningSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/ScreenPinningSettingsTest.java
@@ -24,7 +24,7 @@ import android.os.UserHandle;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settingslib.search.SearchIndexableRaw;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
index 10e397c1..5f3a1d4d 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
@@ -37,7 +37,7 @@ import android.telephony.TelephonyManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
index efbf6462..0a367e38 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.content.Context;
import androidx.preference.SwitchPreference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
index 2c93fc20..0fc01f89 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.security.OwnerInfoPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
index 33a62f40..3c504ab0 100644
--- a/Settings/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComponentInfo;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
diff --git a/Settings/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
index 9727dd13..53e8e6e2 100644
--- a/Settings/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
@@ -40,7 +40,7 @@ import android.content.res.Resources;
import android.os.SystemProperties;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java
index 24b82b2f..1d37d2ef 100644
--- a/Settings/tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java
@@ -30,7 +30,7 @@ import android.os.UserManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.After;
diff --git a/Settings/tests/robotests/src/com/android/settings/sim/SimListDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/sim/SimListDialogFragmentTest.java
index 0ec34e24..dba5787c 100644
--- a/Settings/tests/robotests/src/com/android/settings/sim/SimListDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/sim/SimListDialogFragmentTest.java
@@ -33,7 +33,7 @@ import android.telephony.SubscriptionManager;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Ignore;
diff --git a/Settings/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java b/Settings/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
index cbdcf3c3..e26052a3 100644
--- a/Settings/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
@@ -62,7 +62,7 @@ import android.util.DisplayMetrics;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
diff --git a/Settings/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/Settings/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 67a55e6e..ab31f4f0 100644
--- a/Settings/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -35,7 +35,7 @@ import androidx.slice.SliceProvider;
import androidx.slice.core.SliceAction;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeInvalidSliderController;
import com.android.settings.testutils.FakeSliderController;
diff --git a/Settings/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/Settings/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index 69f1886d..0100fb3d 100644
--- a/Settings/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -30,7 +30,7 @@ import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.text.TextUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.accessibility.AccessibilitySlicePreferenceController;
import com.android.settings.search.SearchFeatureProvider;
diff --git a/Settings/tests/robotests/src/com/android/settings/slices/SlicePreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/slices/SlicePreferenceTest.java
index 1d3d710f..b98c299f 100644
--- a/Settings/tests/robotests/src/com/android/settings/slices/SlicePreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/slices/SlicePreferenceTest.java
@@ -27,7 +27,7 @@ import android.view.View;
import androidx.slice.Slice;
import androidx.slice.widget.SliceView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
index cc2606b0..217f7f27 100644
--- a/Settings/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
@@ -40,7 +40,7 @@ import androidx.preference.ListPreference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.testutils.shadow.ShadowAudioManager;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java
index d9edee20..6bec7609 100644
--- a/Settings/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java
@@ -26,7 +26,7 @@ import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.After;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index b9f9b168..5c3cd2f7 100644
--- a/Settings/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -53,7 +53,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.testutils.shadow.ShadowAudioManager;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
diff --git a/Settings/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/Settings/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index 9f02f1f7..21430c03 100644
--- a/Settings/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -25,7 +25,7 @@ import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Settings;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
diff --git a/Settings/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/Settings/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
index 52d2f012..31d80515 100644
--- a/Settings/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
@@ -18,7 +18,7 @@ package com.android.settings.support;
import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/Settings/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/Settings/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
index 16df9bac..bfcb817e 100644
--- a/Settings/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
@@ -25,7 +25,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.search.SearchIndexableRaw;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java b/Settings/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java
index 8cd0892a..c5cb8979 100644
--- a/Settings/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java
+++ b/Settings/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java
@@ -19,7 +19,7 @@ package com.android.settings.testutils;
import android.content.Context;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
diff --git a/Settings/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/Settings/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
index 9ace6bb0..c2f579a5 100644
--- a/Settings/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
+++ b/Settings/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
@@ -21,7 +21,7 @@ import android.net.Uri;
import android.net.wifi.WifiManager;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceBackgroundWorker;
diff --git a/Settings/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java b/Settings/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java
index d164cb99..f1b2d851 100644
--- a/Settings/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java
+++ b/Settings/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java
@@ -22,7 +22,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.util.Pair;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.drawer.TileUtils;
import org.robolectric.RuntimeEnvironment;
diff --git a/Settings/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
index 7bc66c8f..03c9d4e7 100644
--- a/Settings/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatteryBackupHelperTest.ShadowUserHandle;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
diff --git a/Settings/tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java
index 6c95fce7..e2b05680 100644
--- a/Settings/tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java
@@ -26,7 +26,7 @@ import android.content.Context;
import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settingslib.widget.CandidateInfo;
diff --git a/Settings/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java b/Settings/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
index a47703c0..4f8c7fe2 100644
--- a/Settings/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
@@ -23,7 +23,7 @@ import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
index 874b978d..2562f2c8 100644
--- a/Settings/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
@@ -52,7 +52,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
diff --git a/Settings/tests/robotests/src/com/android/settings/uwb/UwbPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/uwb/UwbPreferenceControllerTest.java
index 23aca514..ed8b8635 100644
--- a/Settings/tests/robotests/src/com/android/settings/uwb/UwbPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/uwb/UwbPreferenceControllerTest.java
@@ -45,7 +45,7 @@ import android.uwb.UwbManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/wfd/WifiDisplayPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/wfd/WifiDisplayPreferenceControllerTest.java
index c90b19ba..f220ada8 100644
--- a/Settings/tests/robotests/src/com/android/settings/wfd/WifiDisplayPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wfd/WifiDisplayPreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.media.MediaRouter;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/AddPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/widget/AddPreferenceTest.java
index 3fccb340..6d29baab 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/AddPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/AddPreferenceTest.java
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java b/Settings/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java
index ea0d89ad..1b506648 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java
@@ -22,7 +22,7 @@ import android.view.View;
import android.widget.LinearLayout;
import android.widget.Space;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/Settings/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index c87aeeae..f37c6e5d 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -41,7 +41,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java b/Settings/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java
index be63fab5..4b191f1a 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java
@@ -22,7 +22,7 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.material.appbar.AppBarLayout;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/Settings/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index 29560ab8..fbe0798b 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -40,7 +40,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/HomepageAppBarScrollingViewBehaviorTest.java b/Settings/tests/robotests/src/com/android/settings/widget/HomepageAppBarScrollingViewBehaviorTest.java
index 6be4c137..b0db5d29 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/HomepageAppBarScrollingViewBehaviorTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/HomepageAppBarScrollingViewBehaviorTest.java
@@ -22,7 +22,7 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.google.android.material.appbar.AppBarLayout;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
index 2ed80e88..ac70d63c 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
@@ -30,7 +30,7 @@ import android.widget.LinearLayout;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
index 732defb8..9f776029 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
@@ -235,7 +235,7 @@ public class SeekBarPreferenceTest {
public static class TestFragment extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- addPreferencesFromResource(com.android.settings.R.xml.seekbar_preference);
+ addPreferencesFromResource(com.cariad.cea.settings.R.xml.seekbar_preference);
}
}
}
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java
index a5ebdade..42910936 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java
@@ -50,7 +50,7 @@ public class SettingsMainSwitchPreferenceTest {
mPreference = new SettingsMainSwitchPreference(context);
ReflectionHelpers.setField(mPreference, "mEnforcedAdmin", mEnforcedAdmin);
ReflectionHelpers.setField(mPreference, "mMainSwitchBar", switchBar);
- final View rootView = View.inflate(context, com.android.settings.R.layout.preference_widget_main_switch,
+ final View rootView = View.inflate(context, com.cariad.cea.settings.R.layout.preference_widget_main_switch,
null /* parent */);
mHolder = PreferenceViewHolder.createInstanceForTests(rootView);
}
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
index f337990d..476ae8b0 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
@@ -25,7 +25,7 @@ import android.content.Context;
import android.view.View;
import android.widget.Button;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
index 35dc6669..0628b6ec 100644
--- a/Settings/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
@@ -36,7 +36,7 @@ import android.widget.ImageView;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowSettingsMediaPlayer;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
index ad38413e..d355bd87 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/ConnectedWifiEntryPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/ConnectedWifiEntryPreferenceTest.java
index 46a6132a..1a6d5d28 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/ConnectedWifiEntryPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/ConnectedWifiEntryPreferenceTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.view.View;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.wifitrackerlib.WifiEntry;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
index 2bb2ee2b..a8d32933 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
@@ -27,7 +27,7 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.LinkifyUtils;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
index 386f66d1..ea3ac586 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
@@ -42,7 +42,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.wifitrackerlib.WifiEntry;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java
index ada47d01..41566fc9 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java
@@ -34,7 +34,7 @@ import android.widget.Button;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/Settings/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index 4fcc93da..1223adf9 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -53,7 +53,7 @@ import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.utils.AndroidKeystoreAliasLoader;
import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 2ff4596d..d93254c0 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -48,7 +48,7 @@ import android.widget.TextView;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settingslib.wifi.AccessPoint;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
index 64bf5254..6871b4c8 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
@@ -42,7 +42,7 @@ import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.os.Bundle;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java
index f732b5e3..c7c576aa 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java
@@ -38,7 +38,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
index 99040dba..869f0982 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
@@ -33,7 +33,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.net.wifi.WifiManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settingslib.wifi.WifiStatusTracker;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 62d6fb8f..2ce42459 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.text.TextUtils;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
index 699a8e80..5900931b 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
@@ -41,7 +41,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiPickerTracker;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreferenceTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreferenceTest.java
index e864ce38..a0dcdbff 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreferenceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreferenceTest.java
@@ -25,7 +25,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
index 0ece5373..26a24df5 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
@@ -37,7 +37,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowDisclaimerItemFactory;
import com.android.settings.testutils.shadow.ShadowFragment;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index 4497a0a6..e7141d73 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -52,7 +52,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.network.ims.MockWifiCallingQueryImsState;
import com.android.settings.network.ims.WifiCallingQueryImsState;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java
index 839f491d..c60df842 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java
@@ -32,7 +32,7 @@ import android.view.View;
import androidx.fragment.app.FragmentActivity;
import com.android.ims.ImsManager;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.ims.MockWifiCallingQueryImsState;
import com.android.settings.widget.RtlCompatibleViewPager;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
index 2d64e169..0c9b8682 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
@@ -47,7 +47,7 @@ import androidx.slice.widget.RowContent;
import androidx.slice.widget.SliceContent;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.network.ims.MockWifiCallingQueryImsState;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.SettingsSliceProvider;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
index 8f96e271..de1e1f14 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
@@ -53,7 +53,7 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.wifi.WifiUtils;
import com.android.settings.wifi.details2.WifiDetailPreferenceController2;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/Settings/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
index 3923cf8c..d6c82246 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
@@ -77,7 +77,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.Utils;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2Test.java b/Settings/tests/robotests/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2Test.java
index c63fa604..56d0d43f 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2Test.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2Test.java
@@ -24,7 +24,7 @@ import android.content.Context;
import androidx.preference.DropDownPreference;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.wifitrackerlib.WifiEntry;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
index e292f24e..af9c221b 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -38,7 +38,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java b/Settings/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
index fc0b9468..b66efbba 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
@@ -32,7 +32,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
index 5c3f920d..e577a664 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
@@ -47,7 +47,7 @@ import androidx.slice.widget.ListContent;
import androidx.slice.widget.SliceLiveData;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settings.testutils.SliceTester;
import com.android.settings.testutils.shadow.ShadowWifiSlice;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
index 432c7e2c..380035e4 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
@@ -30,7 +30,7 @@ import android.net.wifi.WifiManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.widget.FooterPreference;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/Settings/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index 28fb8b37..047f3853 100644
--- a/Settings/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/Settings/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -58,7 +58,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFragment;
diff --git a/Settings/tests/spa_unit/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.kt
index 5d3c1c07..86616a93 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.kt
@@ -23,7 +23,7 @@ import android.net.NetworkPolicyManager
import android.net.NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.specialaccess.DataSaverController.Companion.getUnrestrictedSummary
import com.android.settings.core.BasePreferenceController.AVAILABLE
import com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE
diff --git a/Settings/tests/spa_unit/src/com/android/settings/datausage/BillingCyclePreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/datausage/BillingCyclePreferenceTest.kt
index 4bf38516..914773d5 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/datausage/BillingCyclePreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/datausage/BillingCyclePreferenceTest.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.datausage.lib.BillingCycleRepository
import org.junit.Rule
import org.junit.Test
diff --git a/Settings/tests/spa_unit/src/com/android/settings/datausage/DataUsageListHeaderControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/datausage/DataUsageListHeaderControllerTest.kt
index 8c4f3158..f7c2dfff 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/datausage/DataUsageListHeaderControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/datausage/DataUsageListHeaderControllerTest.kt
@@ -25,7 +25,7 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.testing.TestLifecycleOwner
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.flowOf
diff --git a/Settings/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageRepositoryTest.kt b/Settings/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageRepositoryTest.kt
index 3f517a96..063dc2a9 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageRepositoryTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageRepositoryTest.kt
@@ -25,7 +25,7 @@ import android.os.UserHandle
import android.os.UserManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.Bucket
import com.android.settingslib.AppItem
import com.android.settingslib.spaprivileged.framework.common.userManager
diff --git a/Settings/tests/spa_unit/src/com/android/settings/network/BluetoothWiFiResetPreferenceControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/network/BluetoothWiFiResetPreferenceControllerTest.kt
index 210a0c74..d14e4376 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/network/BluetoothWiFiResetPreferenceControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/network/BluetoothWiFiResetPreferenceControllerTest.kt
@@ -26,7 +26,7 @@ import android.net.VpnManager
import android.os.UserManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController.AVAILABLE
import com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE
import com.google.common.truth.Truth.assertThat
diff --git a/Settings/tests/spa_unit/src/com/android/settings/network/MobileNetworkListFragmentTest.kt b/Settings/tests/spa_unit/src/com/android/settings/network/MobileNetworkListFragmentTest.kt
index 3ba4bac3..cb00aebc 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/network/MobileNetworkListFragmentTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/network/MobileNetworkListFragmentTest.kt
@@ -21,7 +21,7 @@ import android.content.res.Resources
import android.os.UserManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.framework.common.userManager
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/Settings/tests/spa_unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.kt
index 110fd5eb..63463a99 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.kt
@@ -21,7 +21,7 @@ import android.telephony.SubscriptionInfo
import android.telephony.SubscriptionManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/spa_unit/src/com/android/settings/network/TetherPreferenceControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/network/TetherPreferenceControllerTest.kt
index 51d2c87d..395cc87c 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/network/TetherPreferenceControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/network/TetherPreferenceControllerTest.kt
@@ -21,7 +21,7 @@ import android.net.TetheringManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settingslib.TetherUtil
import com.google.common.truth.Truth.assertThat
diff --git a/Settings/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt b/Settings/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
index 03fddb5a..bab3fb09 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
@@ -36,7 +36,7 @@ import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollToNode
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.google.common.truth.Truth
import org.junit.Rule
import org.junit.Test
diff --git a/Settings/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt
index 38c47c28..a83e28f9 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt
@@ -24,7 +24,7 @@ import androidx.preference.PreferenceManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settings.network.SubscriptionInfoListViewModel
import com.android.settings.network.SubscriptionUtil
diff --git a/Settings/tests/spa_unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.kt
index f821e1a7..07983865 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.kt
@@ -34,7 +34,7 @@ import androidx.core.os.persistableBundleOf
import androidx.preference.PreferenceManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Settings.NetworkSelectActivity
import com.android.settings.spa.preference.ComposePreference
import com.google.common.truth.Truth.assertThat
diff --git a/Settings/tests/spa_unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.kt
index 466a5d14..94d97e08 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.kt
@@ -26,7 +26,7 @@ import androidx.preference.Preference
import androidx.preference.PreferenceManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.emptyFlow
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt
index 0ec87548..16f688ab 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.compose.stateOf
import com.android.settingslib.spa.testutils.FakeNavControllerWrapper
import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/ResetAppPreferencesTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/ResetAppPreferencesTest.kt
index b63c2818..572c3517 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/ResetAppPreferencesTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/ResetAppPreferencesTest.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.scaffold.MoreOptionsScope
import org.junit.Rule
import org.junit.Test
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt
index 15fe091e..fee40b03 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt
@@ -37,7 +37,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.appcompat.UserAspectRatioDetails
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
index dfacca89..c7929e5e 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.FakeNavControllerWrapper
import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
import com.android.settingslib.spaprivileged.template.app.AppListItemModel
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppAllServicesPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppAllServicesPreferenceTest.kt
index 291c9d18..1530eba0 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppAllServicesPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppAllServicesPreferenceTest.kt
@@ -38,7 +38,7 @@ import androidx.compose.ui.test.performClick
import androidx.core.os.bundleOf
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.delay
import com.android.settingslib.spa.testutils.waitUntilExists
import com.android.settingslib.spaprivileged.model.app.userHandle
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppArchiveButtonTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppArchiveButtonTest.kt
index 2afb3f1e..60acd344 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppArchiveButtonTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppArchiveButtonTest.kt
@@ -25,7 +25,7 @@ import androidx.compose.material.icons.outlined.CloudUpload
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.delay
import com.android.settingslib.spa.widget.button.ActionButton
import com.google.common.truth.Truth.assertThat
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt
index b7b96b0d..a656d270 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail
import com.android.settings.fuelgauge.batteryusage.BatteryChartPreferenceController
import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppButtonsTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppButtonsTest.kt
index 69acee89..3330deab 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppButtonsTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppButtonsTest.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.test.onRoot
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.flags.Flags as SettingsFlags
import com.android.settingslib.applications.AppUtils
import com.android.settingslib.spa.testutils.delay
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt
index f70f5d5a..6770a01c 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt
@@ -34,7 +34,7 @@ import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.datausage.AppDataUsage
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppForceStopButtonTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppForceStopButtonTest.kt
index 84d6651c..326e16e3 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppForceStopButtonTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppForceStopButtonTest.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.delay
import com.android.settingslib.spaprivileged.framework.common.devicePolicyManager
import com.android.settingslib.spaprivileged.model.app.userId
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptionsTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptionsTest.kt
index 9e7ec9bc..43bd7976 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptionsTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptionsTest.kt
@@ -40,7 +40,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settingslib.spa.testutils.delay
import com.android.settingslib.spa.testutils.waitUntilExists
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt
index 31722c93..fadbc85b 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settings.applications.AppStoreUtil
import com.android.settingslib.applications.AppUtils
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppLocalePreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppLocalePreferenceTest.kt
index 82c9ee94..74805ced 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppLocalePreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppLocalePreferenceTest.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.AppInfoBase
import com.android.settings.applications.AppLocaleUtil
import com.android.settings.applications.appinfo.AppLocaleDetails
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppNotificationPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppNotificationPreferenceTest.kt
index 37f3a119..200c9855 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppNotificationPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppNotificationPreferenceTest.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.notification.app.AppNotificationSettings
import com.android.settings.spa.notification.IAppNotificationRepository
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreferenceTest.kt
index 05a6753c..62254e43 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreferenceTest.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.onRoot
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.testutils.mockAsUser
import com.android.settingslib.spaprivileged.framework.common.domainVerificationManager
import org.junit.Before
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionPreferenceTest.kt
index 11d4b9a7..f698a9f5 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionPreferenceTest.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.test.onRoot
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.delay
import com.android.settingslib.spaprivileged.model.app.userHandle
import com.google.common.truth.Truth.assertThat
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionSummaryTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionSummaryTest.kt
index 0735e3b1..bb65aa71 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionSummaryTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionSummaryTest.kt
@@ -22,7 +22,7 @@ import android.content.pm.PackageManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.testutils.mockAsUser
import com.android.settingslib.applications.PermissionsSummaryHelper
import com.android.settingslib.applications.PermissionsSummaryHelper.PermissionsResultCallback
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppRestoreButtonTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppRestoreButtonTest.kt
index 9d305219..875185eb 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppRestoreButtonTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppRestoreButtonTest.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
import androidx.test.annotation.UiThreadTest
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.widget.button.ActionButton
import com.google.common.truth.Truth.assertThat
import org.junit.Before
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppSettingsPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppSettingsPreferenceTest.kt
index d39555ab..4d7f392e 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppSettingsPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppSettingsPreferenceTest.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.test.onRoot
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.delay
import com.android.settingslib.spaprivileged.model.app.userHandle
import com.android.settingslib.spaprivileged.model.app.userId
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppStoragePreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppStoragePreferenceTest.kt
index ebbd57a6..daa9068f 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppStoragePreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppStoragePreferenceTest.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.onRoot
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.waitUntilExists
import com.android.settingslib.spaprivileged.framework.common.storageStatsManager
import java.util.UUID
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreferenceTest.kt
index 6cc3e3c5..50c98698 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreferenceTest.kt
@@ -33,7 +33,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.onRoot
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.testutils.FakeFeatureFactory
import org.junit.Before
import org.junit.Rule
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreferenceTest.kt
index 5c24559c..b2ef3ad0 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreferenceTest.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.test.onRoot
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.framework.common.userManager
import com.google.common.truth.Truth.assertThat
import java.util.function.Consumer
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt
index b61e3a9f..10bd1fd7 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt
@@ -46,7 +46,7 @@ import androidx.compose.ui.test.onRoot
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils.PROPERTY_APP_HIBERNATION_ENABLED
import com.android.settings.Utils.PROPERTY_HIBERNATION_TARGETS_PRE_S_APPS
import com.android.settings.flags.Flags
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreferenceTest.kt
index 1a78c497..1d7258ce 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreferenceTest.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.Utils
import com.android.settingslib.spa.testutils.delay
import com.android.settingslib.spa.testutils.onDialogText
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreferenceTest.kt
index e123389e..b5e22357 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreferenceTest.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetails
import com.android.settingslib.spa.testutils.delay
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/TopBarAppLaunchButtonTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/TopBarAppLaunchButtonTest.kt
index 7b542478..03200c9f 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/TopBarAppLaunchButtonTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/appinfo/TopBarAppLaunchButtonTest.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.waitUntilExists
import com.android.settingslib.spaprivileged.model.app.userHandle
import org.junit.After
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt
index 5c65da11..4857c047 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.testutils.FakeNavControllerWrapper
import com.android.settingslib.spaprivileged.template.app.AppListItemModel
import com.google.common.truth.Truth.assertThat
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProviderTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProviderTest.kt
index da1e94c1..033ba3d0 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProviderTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProviderTest.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.DisplaySettings
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.SettingsActivity
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail
import com.android.settings.spa.app.battery.BatteryOptimizationModeAppList
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/AllFilesAccessTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/AllFilesAccessTest.kt
index 4c65d90a..958f0fc2 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/AllFilesAccessTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/AllFilesAccessTest.kt
@@ -21,7 +21,7 @@ import android.app.AppOpsManager
import android.content.Context
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsTest.kt
index d68f0515..2b33930a 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsTest.kt
@@ -22,7 +22,7 @@ import android.content.Context
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat
-import com.android.settings.R
+import com.cariad.cea.settings.R
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/LongBackgroundTasksAppsTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/LongBackgroundTasksAppsTest.kt
index 579c6c95..952d374e 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/LongBackgroundTasksAppsTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/LongBackgroundTasksAppsTest.kt
@@ -22,7 +22,7 @@ import android.content.Context
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat
-import com.android.settings.R
+import com.cariad.cea.settings.R
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaManagementAppsTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaManagementAppsTest.kt
index b901043f..9384b701 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaManagementAppsTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaManagementAppsTest.kt
@@ -21,7 +21,7 @@ import android.app.AppOpsManager
import android.content.Context
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaRoutingControlTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaRoutingControlTest.kt
index 990ec5ce..9c4dfd6c 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaRoutingControlTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaRoutingControlTest.kt
@@ -27,7 +27,7 @@ import android.platform.test.flag.junit.SetFlagsRule
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.media.flags.Flags
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.testutils.FakeFeatureFactory
import com.android.settingslib.spaprivileged.model.app.IAppOpsController
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/PictureInPictureTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/PictureInPictureTest.kt
index 42292478..a804f03c 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/PictureInPictureTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/PictureInPictureTest.kt
@@ -26,7 +26,7 @@ import android.content.pm.PackageManager.PackageInfoFlags
import android.os.DeadSystemRuntimeException
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.model.app.AppOpsController
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.flow.first
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/VoiceActivationAppsTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/VoiceActivationAppsTest.kt
index a2aa2937..35d36611 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/VoiceActivationAppsTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/VoiceActivationAppsTest.kt
@@ -5,7 +5,7 @@ import android.app.AppOpsManager
import android.content.Context
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingLabelSimTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingLabelSimTest.kt
index 44a5037e..f83ae65a 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingLabelSimTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingLabelSimTest.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SimOnboardingService
import org.junit.Rule
import org.junit.Test
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingPageProviderTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingPageProviderTest.kt
index d1847c8d..c75ef6c1 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingPageProviderTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingPageProviderTest.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.test.performClick
import androidx.navigation.compose.rememberNavController
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SimOnboardingService
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingPrimarySimTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingPrimarySimTest.kt
index d9c762db..48600ac4 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingPrimarySimTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingPrimarySimTest.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SimOnboardingService
import org.junit.Rule
import org.junit.Test
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingSelectSimTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingSelectSimTest.kt
index e063f697..3a6823d5 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingSelectSimTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/network/SimOnboardingSelectSimTest.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.network.SimOnboardingService
import org.junit.Rule
import org.junit.Test
diff --git a/Settings/tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt b/Settings/tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt
index 5dcc6715..fb7b0c0f 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt
@@ -29,7 +29,7 @@ import android.content.pm.ApplicationInfo
import android.os.Build
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.model.app.IPackageManagers
import com.android.settingslib.spaprivileged.model.app.userId
import com.google.common.truth.Truth.assertThat
diff --git a/Settings/tests/spa_unit/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.kt
index 17cdf048..324eb2f5 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.kt
@@ -27,7 +27,7 @@ import androidx.preference.Preference
import androidx.preference.PreferenceScreen
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spaprivileged.framework.common.userManager
import com.google.common.truth.Truth.assertThat
import org.junit.Before
diff --git a/Settings/tests/spa_unit/src/com/android/settings/widget/CardPreferenceTest.kt b/Settings/tests/spa_unit/src/com/android/settings/widget/CardPreferenceTest.kt
index 0483e367..567b3c5a 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/widget/CardPreferenceTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/widget/CardPreferenceTest.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Rule
diff --git a/Settings/tests/spa_unit/src/com/android/settings/wifi/WepNetworksPreferenceControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/wifi/WepNetworksPreferenceControllerTest.kt
index 49e6a171..d3dfabf5 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/wifi/WepNetworksPreferenceControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/wifi/WepNetworksPreferenceControllerTest.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.test.performClick
import androidx.preference.PreferenceManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.dashboard.DashboardFragment
import com.android.settings.spa.preference.ComposePreference
import com.android.settingslib.spa.testutils.onDialogText
diff --git a/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPageProviderTest.kt b/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPageProviderTest.kt
index 5c9a1a4a..59d0c78c 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPageProviderTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPageProviderTest.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.test.onRoot
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.wifitrackerlib.WifiEntry
import com.google.common.truth.Truth
import org.junit.Rule
diff --git a/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt b/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
index cb1f997f..9bf1467e 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
@@ -20,7 +20,7 @@ import android.content.Context
import androidx.preference.ListPreference
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.wifitrackerlib.WifiEntry
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceControllerTest.kt b/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceControllerTest.kt
index 98997e4f..ba1f0f91 100644
--- a/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceControllerTest.kt
+++ b/Settings/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceControllerTest.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.test.performClick
import androidx.core.os.bundleOf
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settingslib.spa.framework.util.KEY_DESTINATION
import com.google.common.truth.Truth
import org.junit.Rule
diff --git a/Settings/tests/unit/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/Settings/tests/unit/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
index b956089d..f2836dfe 100644
--- a/Settings/tests/unit/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
+++ b/Settings/tests/unit/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertTrue;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/Settings/tests/unit/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceControllerTest.java b/Settings/tests/unit/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceControllerTest.java
index d02240e3..41bb82e2 100644
--- a/Settings/tests/unit/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceControllerTest.java
+++ b/Settings/tests/unit/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.testutils.ResourcesUtils;
import org.junit.Before;
diff --git a/Settings/tests/unit/src/com/android/settings/conecteddevice/threadnetwork/ThreadNetworkPreferenceControllerTest.kt b/Settings/tests/unit/src/com/android/settings/conecteddevice/threadnetwork/ThreadNetworkPreferenceControllerTest.kt
index 644095d1..2bb2d357 100644
--- a/Settings/tests/unit/src/com/android/settings/conecteddevice/threadnetwork/ThreadNetworkPreferenceControllerTest.kt
+++ b/Settings/tests/unit/src/com/android/settings/conecteddevice/threadnetwork/ThreadNetworkPreferenceControllerTest.kt
@@ -34,7 +34,7 @@ import androidx.preference.SwitchPreference
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.net.thread.platform.flags.Flags
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.core.BasePreferenceController.AVAILABLE
import com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE
import com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING
diff --git a/Settings/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/Settings/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
index cad68e1d..41adddd7 100644
--- a/Settings/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
+++ b/Settings/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
@@ -42,7 +42,7 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settingslib.applications.StorageStatsSource;
import org.junit.Before;
diff --git a/Settings/tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java b/Settings/tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java
index 6213f8ee..1d2ff2b3 100644
--- a/Settings/tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java
+++ b/Settings/tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java
@@ -41,7 +41,7 @@ import android.telephony.TelephonyManager;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.ResetNetworkRequest;
+import com.cariad.cea.settings.ResetNetworkRequest;
import org.junit.Before;
import org.junit.Test;
diff --git a/Settings/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/Settings/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
index 3b9ac9de..12b63e9c 100644
--- a/Settings/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
+++ b/Settings/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -44,7 +44,7 @@ import android.text.TextUtils;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/Settings/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java b/Settings/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java
index 971ca40c..6decc242 100644
--- a/Settings/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java
+++ b/Settings/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java
@@ -73,13 +73,13 @@ public class AutoLockSettingsFragmentTest {
Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL);
when(mResources.getStringArray(
- com.android.settings.R.array.private_space_auto_lock_options))
+ com.cariad.cea.settings.R.array.private_space_auto_lock_options))
.thenReturn(
new String[] {
"Every time device locks", "After 5 minutes of inactivity", "Never"
});
when(mResources.getStringArray(
- com.android.settings.R.array.private_space_auto_lock_options_values))
+ com.cariad.cea.settings.R.array.private_space_auto_lock_options_values))
.thenReturn(new String[] {"0", "1", "2"});
doReturn(mResources).when(mContext).getResources();
}
diff --git a/Settings/tests/unit/src/com/android/settings/search/FakeSettingsFragment.java b/Settings/tests/unit/src/com/android/settings/search/FakeSettingsFragment.java
index 6dbb7fb9..603136c2 100644
--- a/Settings/tests/unit/src/com/android/settings/search/FakeSettingsFragment.java
+++ b/Settings/tests/unit/src/com/android/settings/search/FakeSettingsFragment.java
@@ -61,7 +61,7 @@ public class FakeSettingsFragment extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
- return com.android.settings.R.xml.display_settings;
+ return com.cariad.cea.settings.R.xml.display_settings;
}
@Override
@@ -101,7 +101,7 @@ public class FakeSettingsFragment extends DashboardFragment {
final ArrayList result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = com.android.settings.R.xml.display_settings;
+ sir.xmlResId = com.cariad.cea.settings.R.xml.display_settings;
result.add(sir);
return result;
}
diff --git a/Settings/tests/unit/src/com/android/settings/testutils/FakeToggleController.java b/Settings/tests/unit/src/com/android/settings/testutils/FakeToggleController.java
index a7e7320a..13383783 100644
--- a/Settings/tests/unit/src/com/android/settings/testutils/FakeToggleController.java
+++ b/Settings/tests/unit/src/com/android/settings/testutils/FakeToggleController.java
@@ -21,7 +21,7 @@ import android.net.Uri;
import android.net.wifi.WifiManager;
import android.provider.Settings;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceBackgroundWorker;
diff --git a/Settings/tests/unit/src/com/android/settings/wifi/WifiDialog2Test.kt b/Settings/tests/unit/src/com/android/settings/wifi/WifiDialog2Test.kt
index 0b14790e..9f2845a4 100644
--- a/Settings/tests/unit/src/com/android/settings/wifi/WifiDialog2Test.kt
+++ b/Settings/tests/unit/src/com/android/settings/wifi/WifiDialog2Test.kt
@@ -19,7 +19,7 @@ package com.android.settings.wifi
import androidx.activity.ComponentActivity
import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.R
+import com.cariad.cea.settings.R
import com.android.settings.wifi.WifiDialog2.WifiDialog2Listener
import com.android.wifitrackerlib.WifiEntry
import com.google.common.truth.Truth.assertThat
diff --git a/Settings/tests/unit/src/com/android/settings/wifi/WifiUtilsTest.java b/Settings/tests/unit/src/com/android/settings/wifi/WifiUtilsTest.java
index d5d4c7f6..ab237cdd 100644
--- a/Settings/tests/unit/src/com/android/settings/wifi/WifiUtilsTest.java
+++ b/Settings/tests/unit/src/com/android/settings/wifi/WifiUtilsTest.java
@@ -31,7 +31,7 @@ import android.net.wifi.WifiManager;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.R;
+import com.cariad.cea.settings.R;
import com.android.wifitrackerlib.WifiEntry;
import org.junit.Before;