fix: 修改版本后

Settings/build.gradle

@@ -30,14 +30,14 @@ plugins {
 //}
 
 android {
-    namespace 'com.android.settings'
+    namespace 'com.cariad.cea.settings'
     compileSdk 34
 
     defaultConfig {
         applicationId "com.cariad.cea.settings"
         minSdk 31
         targetSdk 34
-        versionCode 1
+        versionCode 15
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -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

Settings/res/layout/activity_my_main.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MyMainActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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 {
 

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;

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

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 {
 

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;

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 {
 

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;

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 {

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;

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 {

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;

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;

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;
 
 /**

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;

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
  */

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;
 

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

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:
  * <ul>

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;

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;
 

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;

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

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

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";
 

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;

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;
 

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;
 

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;
 

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.
  */

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 {
 

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;

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;

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;

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;

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;

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;
 

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.

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;

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;
 

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;

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.

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;

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;

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;

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;
 

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;

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;
 

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;
 

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;

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.

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;
 

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;

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;
 

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;

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;
 
 /**

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;

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;
 

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;

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;

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.

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;

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;
 
 /**

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). */

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;

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.

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.

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 **/

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;
 

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;

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;

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;

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;
 

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;
 

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;
 

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 {

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;
 

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;
 

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;

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 {

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. */

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;

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;

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;
 

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;
 

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;
 

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;

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;

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. */

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

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;

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;

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. */

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;

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;

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.

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