diff --git a/CLAUDE.md b/CLAUDE.md index 9e99aa796..506e01492 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -36,12 +36,18 @@ Launcher3Aosp13/ │ ├── tapl/ # Test Automation Platform Library │ └── multivalentTests/ # Multi-variant tests ├── go/ # Launcher3Go variant (Android Go) -├── animationlib/ # Animation library module -├── iconloaderlib/ # Icon loading library module -├── shared/ # Shared utilities module -├── wm_shared/ # Window Manager shared code -├── msdllib/ # MSDL (Multi-Sensory Design Language) module -├── flagslib/ # Feature flags module +├── modules/ # All Gradle library modules live here +│ ├── animationlib/ # Animation library module +│ ├── iconloaderlib/ # Icon loading library module +│ ├── shared/ # Shared utilities module +│ ├── wm_shared/ # Window Manager shared code +│ ├── msdllib/ # MSDL (Multi-Sensory Design Language) module +│ ├── flagslib/ # Feature flags module +│ ├── hidden-api/ # Hidden API stubs module +│ ├── SettingsLib/ # Partial SettingsLib port (11 preference modules) +│ ├── compatLib/ # Per-API-level compat shims (VQ..VBaklava) +│ ├── systemUIPluginCore/ # SystemUI plugin core +│ └── androidx-lib/ # AndroidX overrides ├── compose/ # Jetpack Compose integration ├── protos/ # Protocol buffer definitions ├── prebuilts/ # Prebuilt JAR dependencies diff --git a/build.gradle b/build.gradle index b4b769ce8..75e2e22c1 100644 --- a/build.gradle +++ b/build.gradle @@ -337,21 +337,21 @@ dependencies { } dependencies { - implementation project(':IconLoader') - implementation project(':Animation') - implementation project(':Shared') - implementation project(':msdl') - implementation project(':flags') - implementation project(':WMShared') - implementation project(':SettingsLib-SettingsTheme') - implementation project(':SettingsLib-SliderPreference') - implementation project(':SettingsLib-SelectorWithWidgetPreference') - implementation project(':SettingsLib-ExpandablePreference') - implementation project(':SettingsLib-SegmentedButtonPreference') - implementation project(':SettingsLib-MainSwitchPreference') - //implementation project(':SettingsLib-TopIntroPreference') - //implementation project(':SettingsLib-FooterPreference') - withQuickstepCompileOnly project(':HiddenApi') + implementation project(':iconloaderlib') + implementation project(':animationlib') + implementation project(':shared') + implementation project(':msdllib') + implementation project(':flagslib') + implementation project(':wm_shared') + implementation project(':SettingsLib:SettingsTheme') + implementation project(':SettingsLib:SliderPreference') + implementation project(':SettingsLib:SelectorWithWidgetPreference') + implementation project(':SettingsLib:ExpandablePreference') + implementation project(':SettingsLib:SegmentedButtonPreference') + implementation project(':SettingsLib:MainSwitchPreference') + //implementation project(':SettingsLib:TopIntroPreference') + //implementation project(':SettingsLib:FooterPreference') + withQuickstepCompileOnly project(':hidden-api') // Include all compat libs implementation project(':compatLib') diff --git a/SettingsLib/DataStore/Android.bp b/modules/SettingsLib/DataStore/Android.bp similarity index 100% rename from SettingsLib/DataStore/Android.bp rename to modules/SettingsLib/DataStore/Android.bp diff --git a/SettingsLib/DataStore/AndroidManifest.xml b/modules/SettingsLib/DataStore/AndroidManifest.xml similarity index 100% rename from SettingsLib/DataStore/AndroidManifest.xml rename to modules/SettingsLib/DataStore/AndroidManifest.xml diff --git a/SettingsLib/DataStore/OWNERS b/modules/SettingsLib/DataStore/OWNERS similarity index 100% rename from SettingsLib/DataStore/OWNERS rename to modules/SettingsLib/DataStore/OWNERS diff --git a/SettingsLib/DataStore/README.md b/modules/SettingsLib/DataStore/README.md similarity index 100% rename from SettingsLib/DataStore/README.md rename to modules/SettingsLib/DataStore/README.md diff --git a/SettingsLib/DataStore/build.gradle b/modules/SettingsLib/DataStore/build.gradle similarity index 100% rename from SettingsLib/DataStore/build.gradle rename to modules/SettingsLib/DataStore/build.gradle diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupCodec.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupCodec.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupCodec.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupCodec.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreContext.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreContext.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreContext.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreContext.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreEntity.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreEntity.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreEntity.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreEntity.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreFileArchiver.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreFileArchiver.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreFileArchiver.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreFileArchiver.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreFileStorage.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreFileStorage.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreFileStorage.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreFileStorage.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreStorage.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreStorage.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreStorage.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreStorage.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreStorageManager.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreStorageManager.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreStorageManager.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/BackupRestoreStorageManager.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/DataChangeReason.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/DataChangeReason.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/DataChangeReason.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/DataChangeReason.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/HandlerExecutor.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/HandlerExecutor.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/HandlerExecutor.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/HandlerExecutor.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyValueStore.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyValueStore.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyValueStore.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyValueStore.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyedObserver.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyedObserver.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyedObserver.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyedObserver.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/ObservableBackupRestoreStorage.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/ObservableBackupRestoreStorage.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/ObservableBackupRestoreStorage.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/ObservableBackupRestoreStorage.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/Observer.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/Observer.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/Observer.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/Observer.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/Permissions.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/Permissions.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/Permissions.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/Permissions.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsGlobalStore.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsGlobalStore.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsGlobalStore.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsGlobalStore.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSecureStore.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSecureStore.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSecureStore.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSecureStore.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsStore.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsStore.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsStore.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsStore.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSystemStore.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSystemStore.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSystemStore.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSystemStore.kt diff --git a/SettingsLib/DataStore/src/com/android/settingslib/datastore/SharedPreferencesStorage.kt b/modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SharedPreferencesStorage.kt similarity index 100% rename from SettingsLib/DataStore/src/com/android/settingslib/datastore/SharedPreferencesStorage.kt rename to modules/SettingsLib/DataStore/src/com/android/settingslib/datastore/SharedPreferencesStorage.kt diff --git a/SettingsLib/DataStore/tests/Android.bp b/modules/SettingsLib/DataStore/tests/Android.bp similarity index 100% rename from SettingsLib/DataStore/tests/Android.bp rename to modules/SettingsLib/DataStore/tests/Android.bp diff --git a/SettingsLib/DataStore/tests/AndroidManifest.xml b/modules/SettingsLib/DataStore/tests/AndroidManifest.xml similarity index 100% rename from SettingsLib/DataStore/tests/AndroidManifest.xml rename to modules/SettingsLib/DataStore/tests/AndroidManifest.xml diff --git a/SettingsLib/DataStore/tests/config/robolectric.properties b/modules/SettingsLib/DataStore/tests/config/robolectric.properties similarity index 100% rename from SettingsLib/DataStore/tests/config/robolectric.properties rename to modules/SettingsLib/DataStore/tests/config/robolectric.properties diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupCodecTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupCodecTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupCodecTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupCodecTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreContextTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreContextTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreContextTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreContextTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreFileArchiverTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreFileArchiverTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreFileArchiverTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreFileArchiverTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreFileStorageTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreFileStorageTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreFileStorageTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreFileStorageTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreStorageManagerTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreStorageManagerTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreStorageManagerTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreStorageManagerTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreStorageTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreStorageTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreStorageTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/BackupRestoreStorageTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/KeyedObserverTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/KeyedObserverTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/KeyedObserverTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/KeyedObserverTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/ObserverTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/ObserverTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/ObserverTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/ObserverTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/PermissionsTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/PermissionsTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/PermissionsTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/PermissionsTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/SharedPreferencesStorageTest.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/SharedPreferencesStorageTest.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/SharedPreferencesStorageTest.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/SharedPreferencesStorageTest.kt diff --git a/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/TestUtils.kt b/modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/TestUtils.kt similarity index 100% rename from SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/TestUtils.kt rename to modules/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/TestUtils.kt diff --git a/SettingsLib/ExpandablePreference/Android.bp b/modules/SettingsLib/ExpandablePreference/Android.bp similarity index 100% rename from SettingsLib/ExpandablePreference/Android.bp rename to modules/SettingsLib/ExpandablePreference/Android.bp diff --git a/SettingsLib/ExpandablePreference/AndroidManifest.xml b/modules/SettingsLib/ExpandablePreference/AndroidManifest.xml similarity index 100% rename from SettingsLib/ExpandablePreference/AndroidManifest.xml rename to modules/SettingsLib/ExpandablePreference/AndroidManifest.xml diff --git a/SettingsLib/ExpandablePreference/build.gradle b/modules/SettingsLib/ExpandablePreference/build.gradle similarity index 92% rename from SettingsLib/ExpandablePreference/build.gradle rename to modules/SettingsLib/ExpandablePreference/build.gradle index 065e5f887..9ab75d873 100644 --- a/SettingsLib/ExpandablePreference/build.gradle +++ b/modules/SettingsLib/ExpandablePreference/build.gradle @@ -26,7 +26,7 @@ android { } dependencies { - api project(':SettingsLib-SettingsTheme') + api project(':SettingsLib:SettingsTheme') implementation(libs.annotation) implementation(libs.androidx.preference) } diff --git a/SettingsLib/ExpandablePreference/res/drawable/settingslib_ic_expand.xml b/modules/SettingsLib/ExpandablePreference/res/drawable/settingslib_ic_expand.xml similarity index 100% rename from SettingsLib/ExpandablePreference/res/drawable/settingslib_ic_expand.xml rename to modules/SettingsLib/ExpandablePreference/res/drawable/settingslib_ic_expand.xml diff --git a/SettingsLib/ExpandablePreference/res/layout/settingslib_widget_expandable_icon.xml b/modules/SettingsLib/ExpandablePreference/res/layout/settingslib_widget_expandable_icon.xml similarity index 100% rename from SettingsLib/ExpandablePreference/res/layout/settingslib_widget_expandable_icon.xml rename to modules/SettingsLib/ExpandablePreference/res/layout/settingslib_widget_expandable_icon.xml diff --git a/SettingsLib/ExpandablePreference/src/com/android/settingslib/widget/ExpandablePreference.kt b/modules/SettingsLib/ExpandablePreference/src/com/android/settingslib/widget/ExpandablePreference.kt similarity index 100% rename from SettingsLib/ExpandablePreference/src/com/android/settingslib/widget/ExpandablePreference.kt rename to modules/SettingsLib/ExpandablePreference/src/com/android/settingslib/widget/ExpandablePreference.kt diff --git a/SettingsLib/FooterPreference/AndroidManifest.xml b/modules/SettingsLib/FooterPreference/AndroidManifest.xml similarity index 100% rename from SettingsLib/FooterPreference/AndroidManifest.xml rename to modules/SettingsLib/FooterPreference/AndroidManifest.xml diff --git a/SettingsLib/FooterPreference/build.gradle b/modules/SettingsLib/FooterPreference/build.gradle similarity index 92% rename from SettingsLib/FooterPreference/build.gradle rename to modules/SettingsLib/FooterPreference/build.gradle index 15f2ddc9d..95b4fbcd3 100644 --- a/SettingsLib/FooterPreference/build.gradle +++ b/modules/SettingsLib/FooterPreference/build.gradle @@ -24,7 +24,7 @@ android { } dependencies { - api project(':SettingsLib-SettingsTheme') + api project(':SettingsLib:SettingsTheme') implementation(libs.annotation) implementation(libs.androidx.preference) } diff --git a/SettingsLib/FooterPreference/res/drawable/settingslib_ic_info_outline_24.xml b/modules/SettingsLib/FooterPreference/res/drawable/settingslib_ic_info_outline_24.xml similarity index 100% rename from SettingsLib/FooterPreference/res/drawable/settingslib_ic_info_outline_24.xml rename to modules/SettingsLib/FooterPreference/res/drawable/settingslib_ic_info_outline_24.xml diff --git a/SettingsLib/FooterPreference/res/layout/preference_footer.xml b/modules/SettingsLib/FooterPreference/res/layout/preference_footer.xml similarity index 100% rename from SettingsLib/FooterPreference/res/layout/preference_footer.xml rename to modules/SettingsLib/FooterPreference/res/layout/preference_footer.xml diff --git a/SettingsLib/FooterPreference/res/values/styles.xml b/modules/SettingsLib/FooterPreference/res/values/styles.xml similarity index 100% rename from SettingsLib/FooterPreference/res/values/styles.xml rename to modules/SettingsLib/FooterPreference/res/values/styles.xml diff --git a/SettingsLib/FooterPreference/res/values/styles_preference_expressive.xml b/modules/SettingsLib/FooterPreference/res/values/styles_preference_expressive.xml similarity index 100% rename from SettingsLib/FooterPreference/res/values/styles_preference_expressive.xml rename to modules/SettingsLib/FooterPreference/res/values/styles_preference_expressive.xml diff --git a/SettingsLib/FooterPreference/src/com/android/settingslib/widget/FooterPreference.java b/modules/SettingsLib/FooterPreference/src/com/android/settingslib/widget/FooterPreference.java similarity index 100% rename from SettingsLib/FooterPreference/src/com/android/settingslib/widget/FooterPreference.java rename to modules/SettingsLib/FooterPreference/src/com/android/settingslib/widget/FooterPreference.java diff --git a/SettingsLib/FooterPreference/src/com/android/settingslib/widget/LinkTextView.java b/modules/SettingsLib/FooterPreference/src/com/android/settingslib/widget/LinkTextView.java similarity index 100% rename from SettingsLib/FooterPreference/src/com/android/settingslib/widget/LinkTextView.java rename to modules/SettingsLib/FooterPreference/src/com/android/settingslib/widget/LinkTextView.java diff --git a/SettingsLib/MainSwitchPreference/Android.bp b/modules/SettingsLib/MainSwitchPreference/Android.bp similarity index 100% rename from SettingsLib/MainSwitchPreference/Android.bp rename to modules/SettingsLib/MainSwitchPreference/Android.bp diff --git a/SettingsLib/MainSwitchPreference/AndroidManifest.xml b/modules/SettingsLib/MainSwitchPreference/AndroidManifest.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/AndroidManifest.xml rename to modules/SettingsLib/MainSwitchPreference/AndroidManifest.xml diff --git a/SettingsLib/MainSwitchPreference/build.gradle b/modules/SettingsLib/MainSwitchPreference/build.gradle similarity index 86% rename from SettingsLib/MainSwitchPreference/build.gradle rename to modules/SettingsLib/MainSwitchPreference/build.gradle index 6f5a08504..d90d954a3 100644 --- a/SettingsLib/MainSwitchPreference/build.gradle +++ b/modules/SettingsLib/MainSwitchPreference/build.gradle @@ -26,7 +26,7 @@ android { } dependencies { - api project(':SettingsLib-Preference') - api project(':SettingsLib-SettingsTheme') + api project(':SettingsLib:Preference') + api project(':SettingsLib:SettingsTheme') implementation(libs.androidx.preference) } diff --git a/SettingsLib/MainSwitchPreference/res/color/settingslib_expressive_color_main_switch_bar_bg.xml b/modules/SettingsLib/MainSwitchPreference/res/color/settingslib_expressive_color_main_switch_bar_bg.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/color/settingslib_expressive_color_main_switch_bar_bg.xml rename to modules/SettingsLib/MainSwitchPreference/res/color/settingslib_expressive_color_main_switch_bar_bg.xml diff --git a/SettingsLib/MainSwitchPreference/res/color/settingslib_expressive_color_main_switch_text.xml b/modules/SettingsLib/MainSwitchPreference/res/color/settingslib_expressive_color_main_switch_text.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/color/settingslib_expressive_color_main_switch_text.xml rename to modules/SettingsLib/MainSwitchPreference/res/color/settingslib_expressive_color_main_switch_text.xml diff --git a/SettingsLib/MainSwitchPreference/res/color/settingslib_main_switch_text_color.xml b/modules/SettingsLib/MainSwitchPreference/res/color/settingslib_main_switch_text_color.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/color/settingslib_main_switch_text_color.xml rename to modules/SettingsLib/MainSwitchPreference/res/color/settingslib_main_switch_text_color.xml diff --git a/SettingsLib/MainSwitchPreference/res/drawable/settingslib_expressive_switch_bar_bg.xml b/modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_expressive_switch_bar_bg.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/drawable/settingslib_expressive_switch_bar_bg.xml rename to modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_expressive_switch_bar_bg.xml diff --git a/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg.xml b/modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg.xml rename to modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg.xml diff --git a/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_disabled.xml b/modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_disabled.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_disabled.xml rename to modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_disabled.xml diff --git a/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_off.xml b/modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_off.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_off.xml rename to modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_off.xml diff --git a/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_on.xml b/modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_on.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_on.xml rename to modules/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_on.xml diff --git a/SettingsLib/MainSwitchPreference/res/layout/settingslib_expressive_main_switch_bar.xml b/modules/SettingsLib/MainSwitchPreference/res/layout/settingslib_expressive_main_switch_bar.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/layout/settingslib_expressive_main_switch_bar.xml rename to modules/SettingsLib/MainSwitchPreference/res/layout/settingslib_expressive_main_switch_bar.xml diff --git a/SettingsLib/MainSwitchPreference/res/layout/settingslib_expressive_main_switch_layout.xml b/modules/SettingsLib/MainSwitchPreference/res/layout/settingslib_expressive_main_switch_layout.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/layout/settingslib_expressive_main_switch_layout.xml rename to modules/SettingsLib/MainSwitchPreference/res/layout/settingslib_expressive_main_switch_layout.xml diff --git a/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml b/modules/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml rename to modules/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml diff --git a/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml b/modules/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml rename to modules/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml diff --git a/SettingsLib/MainSwitchPreference/res/values-night/colors.xml b/modules/SettingsLib/MainSwitchPreference/res/values-night/colors.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/values-night/colors.xml rename to modules/SettingsLib/MainSwitchPreference/res/values-night/colors.xml diff --git a/SettingsLib/MainSwitchPreference/res/values/colors.xml b/modules/SettingsLib/MainSwitchPreference/res/values/colors.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/values/colors.xml rename to modules/SettingsLib/MainSwitchPreference/res/values/colors.xml diff --git a/SettingsLib/MainSwitchPreference/res/values/dimens.xml b/modules/SettingsLib/MainSwitchPreference/res/values/dimens.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/values/dimens.xml rename to modules/SettingsLib/MainSwitchPreference/res/values/dimens.xml diff --git a/SettingsLib/MainSwitchPreference/res/values/styles.xml b/modules/SettingsLib/MainSwitchPreference/res/values/styles.xml similarity index 100% rename from SettingsLib/MainSwitchPreference/res/values/styles.xml rename to modules/SettingsLib/MainSwitchPreference/res/values/styles.xml diff --git a/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java b/modules/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java similarity index 100% rename from SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java rename to modules/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java diff --git a/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java b/modules/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java similarity index 100% rename from SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java rename to modules/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java diff --git a/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreferenceBinding.kt b/modules/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreferenceBinding.kt similarity index 100% rename from SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreferenceBinding.kt rename to modules/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreferenceBinding.kt diff --git a/SettingsLib/Metadata/Android.bp b/modules/SettingsLib/Metadata/Android.bp similarity index 100% rename from SettingsLib/Metadata/Android.bp rename to modules/SettingsLib/Metadata/Android.bp diff --git a/SettingsLib/Metadata/AndroidManifest.xml b/modules/SettingsLib/Metadata/AndroidManifest.xml similarity index 100% rename from SettingsLib/Metadata/AndroidManifest.xml rename to modules/SettingsLib/Metadata/AndroidManifest.xml diff --git a/SettingsLib/Metadata/OWNERS b/modules/SettingsLib/Metadata/OWNERS similarity index 100% rename from SettingsLib/Metadata/OWNERS rename to modules/SettingsLib/Metadata/OWNERS diff --git a/SettingsLib/Metadata/build.gradle b/modules/SettingsLib/Metadata/build.gradle similarity index 93% rename from SettingsLib/Metadata/build.gradle rename to modules/SettingsLib/Metadata/build.gradle index 05cd9ac92..6cbda0dd5 100644 --- a/SettingsLib/Metadata/build.gradle +++ b/modules/SettingsLib/Metadata/build.gradle @@ -26,7 +26,7 @@ android { } dependencies { - api project(':SettingsLib-DataStore') + api project(':SettingsLib:DataStore') implementation(libs.annotation) implementation(libs.androidx.fragment) } diff --git a/SettingsLib/Metadata/processor/Android.bp b/modules/SettingsLib/Metadata/processor/Android.bp similarity index 100% rename from SettingsLib/Metadata/processor/Android.bp rename to modules/SettingsLib/Metadata/processor/Android.bp diff --git a/SettingsLib/Metadata/processor/resources/META-INF/services/javax.annotation.processing.Processor b/modules/SettingsLib/Metadata/processor/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from SettingsLib/Metadata/processor/resources/META-INF/services/javax.annotation.processing.Processor rename to modules/SettingsLib/Metadata/processor/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/SettingsLib/Metadata/processor/src/com/android/settingslib/metadata/PreferenceScreenAnnotationProcessor.kt b/modules/SettingsLib/Metadata/processor/src/com/android/settingslib/metadata/PreferenceScreenAnnotationProcessor.kt similarity index 100% rename from SettingsLib/Metadata/processor/src/com/android/settingslib/metadata/PreferenceScreenAnnotationProcessor.kt rename to modules/SettingsLib/Metadata/processor/src/com/android/settingslib/metadata/PreferenceScreenAnnotationProcessor.kt diff --git a/SettingsLib/Metadata/proguard.pgcfg b/modules/SettingsLib/Metadata/proguard.pgcfg similarity index 100% rename from SettingsLib/Metadata/proguard.pgcfg rename to modules/SettingsLib/Metadata/proguard.pgcfg diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/Annotations.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/Annotations.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/Annotations.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/Annotations.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/Bundles.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/Bundles.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/Bundles.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/Bundles.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/FixedArrayMap.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/FixedArrayMap.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/FixedArrayMap.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/FixedArrayMap.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/Metrics.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/Metrics.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/Metrics.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/Metrics.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PersistentPreference.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PersistentPreference.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PersistentPreference.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PersistentPreference.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceCoordinate.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceCoordinate.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceCoordinate.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceCoordinate.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceHierarchy.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceHierarchy.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceHierarchy.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceHierarchy.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenBindingKeyProvider.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenBindingKeyProvider.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenBindingKeyProvider.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenBindingKeyProvider.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenMetadata.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenMetadata.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenMetadata.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenMetadata.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceSearchIndexablesProvider.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceSearchIndexablesProvider.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceSearchIndexablesProvider.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceSearchIndexablesProvider.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceTypes.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceTypes.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceTypes.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceTypes.kt diff --git a/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt b/modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt similarity index 100% rename from SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt rename to modules/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt diff --git a/SettingsLib/Metadata/tests/Android.bp b/modules/SettingsLib/Metadata/tests/Android.bp similarity index 100% rename from SettingsLib/Metadata/tests/Android.bp rename to modules/SettingsLib/Metadata/tests/Android.bp diff --git a/SettingsLib/Metadata/tests/AndroidManifest.xml b/modules/SettingsLib/Metadata/tests/AndroidManifest.xml similarity index 100% rename from SettingsLib/Metadata/tests/AndroidManifest.xml rename to modules/SettingsLib/Metadata/tests/AndroidManifest.xml diff --git a/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/BundlesTest.kt b/modules/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/BundlesTest.kt similarity index 100% rename from SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/BundlesTest.kt rename to modules/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/BundlesTest.kt diff --git a/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceHierarchyTest.kt b/modules/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceHierarchyTest.kt similarity index 100% rename from SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceHierarchyTest.kt rename to modules/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceHierarchyTest.kt diff --git a/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceScreenMetadataTest.kt b/modules/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceScreenMetadataTest.kt similarity index 100% rename from SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceScreenMetadataTest.kt rename to modules/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceScreenMetadataTest.kt diff --git a/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceScreenRegistryTest.kt b/modules/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceScreenRegistryTest.kt similarity index 100% rename from SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceScreenRegistryTest.kt rename to modules/SettingsLib/Metadata/tests/src/com/android/settingslib/metadata/PreferenceScreenRegistryTest.kt diff --git a/SettingsLib/Preference/Android.bp b/modules/SettingsLib/Preference/Android.bp similarity index 100% rename from SettingsLib/Preference/Android.bp rename to modules/SettingsLib/Preference/Android.bp diff --git a/SettingsLib/Preference/AndroidManifest.xml b/modules/SettingsLib/Preference/AndroidManifest.xml similarity index 100% rename from SettingsLib/Preference/AndroidManifest.xml rename to modules/SettingsLib/Preference/AndroidManifest.xml diff --git a/SettingsLib/Preference/OWNERS b/modules/SettingsLib/Preference/OWNERS similarity index 100% rename from SettingsLib/Preference/OWNERS rename to modules/SettingsLib/Preference/OWNERS diff --git a/SettingsLib/Preference/build.gradle b/modules/SettingsLib/Preference/build.gradle similarity index 81% rename from SettingsLib/Preference/build.gradle rename to modules/SettingsLib/Preference/build.gradle index 97f67319d..b425eaaf8 100644 --- a/SettingsLib/Preference/build.gradle +++ b/modules/SettingsLib/Preference/build.gradle @@ -26,9 +26,9 @@ android { } dependencies { - api project(':SettingsLib-DataStore') - api project(':SettingsLib-Metadata') - api project(':SettingsLib-SettingsTheme') + api project(':SettingsLib:DataStore') + api project(':SettingsLib:Metadata') + api project(':SettingsLib:SettingsTheme') implementation(libs.annotation) implementation(libs.androidx.preference) } diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreAdapter.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreAdapter.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreAdapter.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreAdapter.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreDelegate.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreDelegate.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreDelegate.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreDelegate.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceHierarchyInflater.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceHierarchyInflater.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceHierarchyInflater.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceHierarchyInflater.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenFactory.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenFactory.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenFactory.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenFactory.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenProvider.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenProvider.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenProvider.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenProvider.kt diff --git a/SettingsLib/Preference/src/com/android/settingslib/preference/Utils.kt b/modules/SettingsLib/Preference/src/com/android/settingslib/preference/Utils.kt similarity index 100% rename from SettingsLib/Preference/src/com/android/settingslib/preference/Utils.kt rename to modules/SettingsLib/Preference/src/com/android/settingslib/preference/Utils.kt diff --git a/SettingsLib/Preference/tests/Android.bp b/modules/SettingsLib/Preference/tests/Android.bp similarity index 100% rename from SettingsLib/Preference/tests/Android.bp rename to modules/SettingsLib/Preference/tests/Android.bp diff --git a/SettingsLib/Preference/tests/AndroidManifest.xml b/modules/SettingsLib/Preference/tests/AndroidManifest.xml similarity index 100% rename from SettingsLib/Preference/tests/AndroidManifest.xml rename to modules/SettingsLib/Preference/tests/AndroidManifest.xml diff --git a/SettingsLib/Preference/tests/src/com/android/settingslib/preference/PreferenceScreenBindingHelperTest.kt b/modules/SettingsLib/Preference/tests/src/com/android/settingslib/preference/PreferenceScreenBindingHelperTest.kt similarity index 100% rename from SettingsLib/Preference/tests/src/com/android/settingslib/preference/PreferenceScreenBindingHelperTest.kt rename to modules/SettingsLib/Preference/tests/src/com/android/settingslib/preference/PreferenceScreenBindingHelperTest.kt diff --git a/SettingsLib/Preference/testutils/Android.bp b/modules/SettingsLib/Preference/testutils/Android.bp similarity index 100% rename from SettingsLib/Preference/testutils/Android.bp rename to modules/SettingsLib/Preference/testutils/Android.bp diff --git a/SettingsLib/Preference/testutils/AndroidManifest.xml b/modules/SettingsLib/Preference/testutils/AndroidManifest.xml similarity index 100% rename from SettingsLib/Preference/testutils/AndroidManifest.xml rename to modules/SettingsLib/Preference/testutils/AndroidManifest.xml diff --git a/SettingsLib/Preference/testutils/com/android/settingslib/preference/CatalystScreenTestCase.kt b/modules/SettingsLib/Preference/testutils/com/android/settingslib/preference/CatalystScreenTestCase.kt similarity index 100% rename from SettingsLib/Preference/testutils/com/android/settingslib/preference/CatalystScreenTestCase.kt rename to modules/SettingsLib/Preference/testutils/com/android/settingslib/preference/CatalystScreenTestCase.kt diff --git a/SettingsLib/Preference/testutils/com/android/settingslib/preference/PreferenceBindingTestUtils.kt b/modules/SettingsLib/Preference/testutils/com/android/settingslib/preference/PreferenceBindingTestUtils.kt similarity index 100% rename from SettingsLib/Preference/testutils/com/android/settingslib/preference/PreferenceBindingTestUtils.kt rename to modules/SettingsLib/Preference/testutils/com/android/settingslib/preference/PreferenceBindingTestUtils.kt diff --git a/SettingsLib/SegmentedButtonPreference/Android.bp b/modules/SettingsLib/SegmentedButtonPreference/Android.bp similarity index 100% rename from SettingsLib/SegmentedButtonPreference/Android.bp rename to modules/SettingsLib/SegmentedButtonPreference/Android.bp diff --git a/SettingsLib/SegmentedButtonPreference/AndroidManifest.xml b/modules/SettingsLib/SegmentedButtonPreference/AndroidManifest.xml similarity index 100% rename from SettingsLib/SegmentedButtonPreference/AndroidManifest.xml rename to modules/SettingsLib/SegmentedButtonPreference/AndroidManifest.xml diff --git a/SettingsLib/SegmentedButtonPreference/build.gradle b/modules/SettingsLib/SegmentedButtonPreference/build.gradle similarity index 92% rename from SettingsLib/SegmentedButtonPreference/build.gradle rename to modules/SettingsLib/SegmentedButtonPreference/build.gradle index 32b1ace11..0bcd81a05 100644 --- a/SettingsLib/SegmentedButtonPreference/build.gradle +++ b/modules/SettingsLib/SegmentedButtonPreference/build.gradle @@ -26,7 +26,7 @@ android { } dependencies { - api project(':SettingsLib-SettingsTheme') + api project(':SettingsLib:SettingsTheme') implementation(libs.annotation) implementation(libs.androidx.preference) } diff --git a/SettingsLib/SegmentedButtonPreference/res/layout/settingslib_expressive_preference_segmentedbutton.xml b/modules/SettingsLib/SegmentedButtonPreference/res/layout/settingslib_expressive_preference_segmentedbutton.xml similarity index 100% rename from SettingsLib/SegmentedButtonPreference/res/layout/settingslib_expressive_preference_segmentedbutton.xml rename to modules/SettingsLib/SegmentedButtonPreference/res/layout/settingslib_expressive_preference_segmentedbutton.xml diff --git a/SettingsLib/SegmentedButtonPreference/src/com/android/settingslib/widget/SegmentedButtonPreference.kt b/modules/SettingsLib/SegmentedButtonPreference/src/com/android/settingslib/widget/SegmentedButtonPreference.kt similarity index 100% rename from SettingsLib/SegmentedButtonPreference/src/com/android/settingslib/widget/SegmentedButtonPreference.kt rename to modules/SettingsLib/SegmentedButtonPreference/src/com/android/settingslib/widget/SegmentedButtonPreference.kt diff --git a/SettingsLib/SelectorWithWidgetPreference/Android.bp b/modules/SettingsLib/SelectorWithWidgetPreference/Android.bp similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/Android.bp rename to modules/SettingsLib/SelectorWithWidgetPreference/Android.bp diff --git a/SettingsLib/SelectorWithWidgetPreference/AndroidManifest.xml b/modules/SettingsLib/SelectorWithWidgetPreference/AndroidManifest.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/AndroidManifest.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/AndroidManifest.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/build.gradle b/modules/SettingsLib/SelectorWithWidgetPreference/build.gradle similarity index 91% rename from SettingsLib/SelectorWithWidgetPreference/build.gradle rename to modules/SettingsLib/SelectorWithWidgetPreference/build.gradle index 505c37180..9eb1147c5 100644 --- a/SettingsLib/SelectorWithWidgetPreference/build.gradle +++ b/modules/SettingsLib/SelectorWithWidgetPreference/build.gradle @@ -25,6 +25,6 @@ android { } dependencies { - api project(':SettingsLib-SettingsTheme') + api project(':SettingsLib:SettingsTheme') implementation(libs.androidx.preference) } diff --git a/SettingsLib/SelectorWithWidgetPreference/res/drawable/ic_settings_accent.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/drawable/ic_settings_accent.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/drawable/ic_settings_accent.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/drawable/ic_settings_accent.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_selector_with_widget.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_selector_with_widget.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_selector_with_widget.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_selector_with_widget.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_checkbox.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_checkbox.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_checkbox.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_checkbox.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_radiobutton.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_radiobutton.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_radiobutton.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_radiobutton.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-af/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-af/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-af/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-af/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-am/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-am/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-am/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-am/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ar/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ar/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ar/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ar/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-as/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-as/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-as/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-as/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-az/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-az/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-az/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-az/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-b+sr+Latn/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-b+sr+Latn/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-b+sr+Latn/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-b+sr+Latn/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-be/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-be/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-be/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-be/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-bg/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-bg/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-bg/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-bg/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-bn/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-bn/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-bn/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-bn/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-bs/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-bs/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-bs/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-bs/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ca/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ca/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ca/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ca/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-cs/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-cs/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-cs/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-cs/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-da/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-da/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-da/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-da/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-de/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-de/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-de/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-de/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-el/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-el/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-el/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-el/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-en-rAU/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rAU/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-en-rAU/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rAU/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-en-rCA/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rCA/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-en-rCA/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rCA/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-en-rGB/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rGB/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-en-rGB/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rGB/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-en-rIN/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rIN/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-en-rIN/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rIN/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-en-rXC/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rXC/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-en-rXC/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-en-rXC/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-es-rUS/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-es-rUS/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-es-rUS/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-es-rUS/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-es/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-es/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-es/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-es/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-et/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-et/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-et/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-et/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-eu/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-eu/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-eu/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-eu/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-fa/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-fa/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-fa/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-fa/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-fi/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-fi/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-fi/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-fi/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-fr-rCA/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-fr-rCA/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-fr-rCA/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-fr-rCA/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-fr/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-fr/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-fr/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-fr/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-gl/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-gl/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-gl/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-gl/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-gu/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-gu/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-gu/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-gu/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-hi/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-hi/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-hi/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-hi/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-hr/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-hr/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-hr/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-hr/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-hu/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-hu/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-hu/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-hu/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-hy/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-hy/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-hy/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-hy/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-in/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-in/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-in/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-in/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-is/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-is/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-is/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-is/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-it/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-it/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-it/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-it/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-iw/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-iw/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-iw/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-iw/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ja/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ja/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ja/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ja/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ka/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ka/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ka/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ka/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-kk/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-kk/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-kk/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-kk/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-km/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-km/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-km/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-km/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-kn/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-kn/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-kn/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-kn/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ko/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ko/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ko/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ko/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ky/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ky/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ky/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ky/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-lo/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-lo/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-lo/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-lo/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-lt/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-lt/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-lt/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-lt/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-lv/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-lv/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-lv/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-lv/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-mk/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-mk/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-mk/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-mk/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ml/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ml/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ml/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ml/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-mn/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-mn/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-mn/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-mn/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-mr/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-mr/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-mr/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-mr/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ms/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ms/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ms/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ms/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-my/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-my/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-my/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-my/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-nb/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-nb/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-nb/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-nb/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ne/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ne/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ne/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ne/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-nl/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-nl/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-nl/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-nl/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-or/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-or/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-or/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-or/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-pa/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-pa/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-pa/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-pa/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-pl/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-pl/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-pl/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-pl/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-pt-rBR/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-pt-rBR/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-pt-rBR/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-pt-rBR/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-pt-rPT/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-pt-rPT/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-pt-rPT/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-pt-rPT/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-pt/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-pt/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-pt/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-pt/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ro/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ro/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ro/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ro/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ru/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ru/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ru/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ru/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-si/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-si/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-si/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-si/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-sk/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-sk/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-sk/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-sk/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-sl/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-sl/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-sl/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-sl/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-sq/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-sq/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-sq/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-sq/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-sr/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-sr/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-sr/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-sr/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-sv/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-sv/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-sv/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-sv/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-sw/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-sw/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-sw/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-sw/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ta/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ta/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ta/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ta/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-te/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-te/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-te/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-te/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-th/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-th/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-th/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-th/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-tl/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-tl/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-tl/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-tl/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-tr/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-tr/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-tr/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-tr/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-uk/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-uk/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-uk/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-uk/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-ur/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-ur/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-ur/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-ur/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-uz/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-uz/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-uz/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-uz/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-vi/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-vi/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-vi/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-vi/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rCN/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rCN/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-zh-rCN/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rCN/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rHK/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rHK/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-zh-rHK/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rHK/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rTW/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rTW/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-zh-rTW/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-zh-rTW/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values-zu/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values-zu/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values-zu/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values-zu/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values/attrs.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values/attrs.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values/attrs.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values/attrs.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values/strings.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values/strings.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values/strings.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values/strings.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/res/values/styles_preference_expressive.xml b/modules/SettingsLib/SelectorWithWidgetPreference/res/values/styles_preference_expressive.xml similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/res/values/styles_preference_expressive.xml rename to modules/SettingsLib/SelectorWithWidgetPreference/res/values/styles_preference_expressive.xml diff --git a/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java b/modules/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java similarity index 100% rename from SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java rename to modules/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java diff --git a/SettingsLib/SettingsTheme/Android.bp b/modules/SettingsLib/SettingsTheme/Android.bp similarity index 100% rename from SettingsLib/SettingsTheme/Android.bp rename to modules/SettingsLib/SettingsTheme/Android.bp diff --git a/SettingsLib/SettingsTheme/AndroidManifest.xml b/modules/SettingsLib/SettingsTheme/AndroidManifest.xml similarity index 100% rename from SettingsLib/SettingsTheme/AndroidManifest.xml rename to modules/SettingsLib/SettingsTheme/AndroidManifest.xml diff --git a/SettingsLib/SettingsTheme/aconfig/settingstheme.aconfig b/modules/SettingsLib/SettingsTheme/aconfig/settingstheme.aconfig similarity index 100% rename from SettingsLib/SettingsTheme/aconfig/settingstheme.aconfig rename to modules/SettingsLib/SettingsTheme/aconfig/settingstheme.aconfig diff --git a/SettingsLib/SettingsTheme/build.gradle b/modules/SettingsLib/SettingsTheme/build.gradle similarity index 94% rename from SettingsLib/SettingsTheme/build.gradle rename to modules/SettingsLib/SettingsTheme/build.gradle index 174a4546c..55e818c52 100644 --- a/SettingsLib/SettingsTheme/build.gradle +++ b/modules/SettingsLib/SettingsTheme/build.gradle @@ -26,7 +26,7 @@ android { } dependencies { - api(project(":flags")) + api(project(":flagslib")) api(libs.material) implementation(libs.androidx.preference) } diff --git a/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_neutral_variant_card.xml b/modules/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_neutral_variant_card.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-night-v31/settingslib_neutral_variant_card.xml rename to modules/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_neutral_variant_card.xml diff --git a/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_switch_track_on.xml b/modules/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_switch_track_on.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-night-v31/settingslib_switch_track_on.xml rename to modules/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_switch_track_on.xml diff --git a/SettingsLib/SettingsTheme/res/color-night-v34/settingslib_neutral_variant_back_icon.xml b/modules/SettingsLib/SettingsTheme/res/color-night-v34/settingslib_neutral_variant_back_icon.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-night-v34/settingslib_neutral_variant_back_icon.xml rename to modules/SettingsLib/SettingsTheme/res/color-night-v34/settingslib_neutral_variant_back_icon.xml diff --git a/SettingsLib/SettingsTheme/res/color-night/settingslib_neutral_variant_back_icon.xml b/modules/SettingsLib/SettingsTheme/res/color-night/settingslib_neutral_variant_back_icon.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-night/settingslib_neutral_variant_back_icon.xml rename to modules/SettingsLib/SettingsTheme/res/color-night/settingslib_neutral_variant_back_icon.xml diff --git a/SettingsLib/SettingsTheme/res/color-night/settingslib_neutral_variant_card.xml b/modules/SettingsLib/SettingsTheme/res/color-night/settingslib_neutral_variant_card.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-night/settingslib_neutral_variant_card.xml rename to modules/SettingsLib/SettingsTheme/res/color-night/settingslib_neutral_variant_card.xml diff --git a/SettingsLib/SettingsTheme/res/color-night/settingslib_switch_track_outline_color.xml b/modules/SettingsLib/SettingsTheme/res/color-night/settingslib_switch_track_outline_color.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-night/settingslib_switch_track_outline_color.xml rename to modules/SettingsLib/SettingsTheme/res/color-night/settingslib_switch_track_outline_color.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant12.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant12.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant12.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant12.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant17.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant17.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant17.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant17.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant22.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant22.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant22.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant22.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant24.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant24.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant24.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant24.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant4.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant4.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant4.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant4.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant55.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant55.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant55.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant55.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant6.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant6.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant6.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant6.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant87.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant87.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant87.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant87.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant92.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant92.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant92.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant92.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant94.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant94.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant94.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant94.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant96.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant96.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant96.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant96.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant98.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant98.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant98.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant98.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant_back_icon.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant_back_icon.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant_back_icon.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant_back_icon.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant_card.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant_card.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant_card.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_neutral_variant_card.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_preference_bg_color.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_preference_bg_color.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_preference_bg_color.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_preference_bg_color.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml diff --git a/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_off.xml b/modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_off.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_off.xml rename to modules/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_off.xml diff --git a/SettingsLib/SettingsTheme/res/color-v34/settingslib_neutral_variant_back_icon.xml b/modules/SettingsLib/SettingsTheme/res/color-v34/settingslib_neutral_variant_back_icon.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color-v34/settingslib_neutral_variant_back_icon.xml rename to modules/SettingsLib/SettingsTheme/res/color-v34/settingslib_neutral_variant_back_icon.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outline_color_selector.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outline_color_selector.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outline_color_selector.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outline_color_selector.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outlined_background_color_selector.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outlined_background_color_selector.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outlined_background_color_selector.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outlined_background_color_selector.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_halo.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_halo.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_halo.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_halo.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_thumb.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_thumb.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_thumb.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_thumb.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_track_active.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_track_active.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_track_active.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_track_active.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_track_inactive.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_track_inactive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_track_inactive.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_slider_track_inactive.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_thumb.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_thumb.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_thumb.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_thumb.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_thumb_icon.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_thumb_icon.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_thumb_icon.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_thumb_icon.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_track.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_track.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_track.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_color_switch_track.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_expressive_filled_button_color.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_filled_button_color.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_expressive_filled_button_color.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_expressive_filled_button_color.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_neutral_variant_back_icon.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_neutral_variant_back_icon.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_neutral_variant_back_icon.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_neutral_variant_back_icon.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_neutral_variant_card.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_neutral_variant_card.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_neutral_variant_card.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_neutral_variant_card.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_primary_inverse_a50.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_primary_inverse_a50.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_primary_inverse_a50.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_primary_inverse_a50.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_primary_inverse_a75.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_primary_inverse_a75.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_primary_inverse_a75.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_primary_inverse_a75.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_switch_thumb_color.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_switch_thumb_color.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_switch_thumb_color.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_switch_thumb_color.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_color.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_color.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_switch_track_color.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_color.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_off.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_off.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_switch_track_off.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_off.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_outline_color.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_outline_color.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_switch_track_outline_color.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_switch_track_outline_color.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_text_color_primary.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_text_color_primary.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_text_color_primary.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_text_color_primary.xml diff --git a/SettingsLib/SettingsTheme/res/color/settingslib_text_color_secondary.xml b/modules/SettingsLib/SettingsTheme/res/color/settingslib_text_color_secondary.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/color/settingslib_text_color_secondary.xml rename to modules/SettingsLib/SettingsTheme/res/color/settingslib_text_color_secondary.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_arrow_drop_down.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_arrow_drop_down.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_arrow_drop_down.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_arrow_drop_down.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_filled.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_filled.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_filled.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_filled.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_outline.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_outline.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_outline.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_outline.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_back.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_back.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_back.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_back.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_bullet_start.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_bullet_start.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_bullet_start.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_bullet_start.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_check.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_check.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_check.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_check.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_chevron.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_chevron.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_chevron.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_chevron.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_close.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_close.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_close.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_close.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_collapse.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_collapse.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_collapse.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_collapse.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_cross.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_cross.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_cross.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_cross.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_expand.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_expand.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_expand.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_expand.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_high.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_high.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_high.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_high.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_low.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_low.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_low.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_low.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_medium.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_medium.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_medium.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_medium.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_normal.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_normal.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_normal.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_level_normal.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_up.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_up.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_up.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_icon_up.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_background.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_background.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_background.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_background.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_background_outlined.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_background_outlined.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_background_outlined.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_background_outlined.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_dropdown_background.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_dropdown_background.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_dropdown_background.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_spinner_dropdown_background.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_switch_thumb_icon.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_switch_thumb_icon.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_switch_thumb_icon.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_switch_thumb_icon.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_list_divider.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_list_divider.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_list_divider.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_list_divider.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_progress_horizontal.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_progress_horizontal.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_progress_horizontal.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_progress_horizontal.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom_highlighted.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom_highlighted.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom_highlighted.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom_highlighted.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom_selected.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom_selected.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom_selected.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_bottom_selected.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center_highlighted.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center_highlighted.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center_highlighted.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center_highlighted.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center_selected.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center_selected.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center_selected.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_center_selected.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_highlighted.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_highlighted.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_highlighted.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_highlighted.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_selected.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_selected.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_selected.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_selected.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_stateful.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_stateful.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_stateful.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_stateful.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top_highlighted.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top_highlighted.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top_highlighted.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top_highlighted.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top_selected.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top_selected.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top_selected.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_round_background_top_selected.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_spinner_background.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_spinner_background.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_spinner_background.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_spinner_background.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_spinner_dropdown_background.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_spinner_dropdown_background.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_spinner_dropdown_background.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_spinner_dropdown_background.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_switch_thumb.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_switch_thumb.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_switch_thumb.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_switch_thumb.xml diff --git a/SettingsLib/SettingsTheme/res/drawable/settingslib_switch_track.xml b/modules/SettingsLib/SettingsTheme/res/drawable/settingslib_switch_track.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/drawable/settingslib_switch_track.xml rename to modules/SettingsLib/SettingsTheme/res/drawable/settingslib_switch_track.xml diff --git a/SettingsLib/SettingsTheme/res/layout-v33/settingslib_preference_frame.xml b/modules/SettingsLib/SettingsTheme/res/layout-v33/settingslib_preference_frame.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout-v33/settingslib_preference_frame.xml rename to modules/SettingsLib/SettingsTheme/res/layout-v33/settingslib_preference_frame.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_dropdown_preference.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_dropdown_preference.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_dropdown_preference.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_dropdown_preference.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_category.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_category.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_category.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_category.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_dropdown.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_dropdown.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_dropdown.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_dropdown.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_icon_frame.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_icon_frame.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_icon_frame.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_icon_frame.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_switch.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_switch.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_switch.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_switch.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_text_frame.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_text_frame.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_text_frame.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_text_frame.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_two_target_divider.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_two_target_divider.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_expressive_two_target_divider.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_two_target_divider.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_icon_frame.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_icon_frame.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_icon_frame.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_icon_frame.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_pref_widget_chevron.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_pref_widget_chevron.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_pref_widget_chevron.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_pref_widget_chevron.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_preference.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_preference.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_preference.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_preference.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_preference_dialog_edittext.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_preference_dialog_edittext.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_preference_dialog_edittext.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_preference_dialog_edittext.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_preference_frame.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_preference_frame.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_preference_frame.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_preference_frame.xml diff --git a/SettingsLib/SettingsTheme/res/layout/settingslib_space_preference.xml b/modules/SettingsLib/SettingsTheme/res/layout/settingslib_space_preference.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/layout/settingslib_space_preference.xml rename to modules/SettingsLib/SettingsTheme/res/layout/settingslib_space_preference.xml diff --git a/SettingsLib/SettingsTheme/res/values-af/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-af/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-af/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-af/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-am/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-am/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-am/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-am/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ar/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ar/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ar/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ar/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-as/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-as/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-as/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-as/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-az/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-az/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-az/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-az/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-b+sr+Latn/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-b+sr+Latn/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-b+sr+Latn/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-b+sr+Latn/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-be/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-be/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-be/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-be/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-bg/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-bg/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-bg/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-bg/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-bn/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-bn/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-bn/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-bn/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-bs/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-bs/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-bs/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-bs/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ca/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ca/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ca/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ca/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-cs/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-cs/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-cs/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-cs/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-da/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-da/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-da/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-da/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-de/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-de/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-de/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-de/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-el/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-el/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-el/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-el/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-en-rAU/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-en-rAU/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-en-rAU/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-en-rAU/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-en-rCA/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-en-rCA/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-en-rCA/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-en-rCA/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-en-rGB/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-en-rGB/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-en-rGB/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-en-rGB/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-en-rIN/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-en-rIN/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-en-rIN/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-en-rIN/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-es-rUS/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-es-rUS/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-es-rUS/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-es-rUS/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-es/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-es/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-es/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-es/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-et/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-et/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-et/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-et/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-eu/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-eu/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-eu/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-eu/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-fa/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-fa/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-fa/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-fa/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-fi/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-fi/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-fi/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-fi/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-fr-rCA/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-fr-rCA/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-fr-rCA/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-fr-rCA/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-fr/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-fr/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-fr/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-fr/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-gl/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-gl/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-gl/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-gl/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-gu/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-gu/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-gu/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-gu/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-hi/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-hi/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-hi/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-hi/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-hr/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-hr/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-hr/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-hr/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-hu/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-hu/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-hu/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-hu/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-hy/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-hy/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-hy/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-hy/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-in/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-in/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-in/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-in/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-is/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-is/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-is/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-is/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-it/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-it/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-it/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-it/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-iw/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-iw/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-iw/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-iw/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ja/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ja/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ja/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ja/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ka/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ka/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ka/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ka/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-kk/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-kk/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-kk/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-kk/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-km/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-km/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-km/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-km/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-kn/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-kn/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-kn/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-kn/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ko/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ko/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ko/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ko/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ky/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ky/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ky/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ky/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-lo/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-lo/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-lo/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-lo/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-lt/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-lt/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-lt/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-lt/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-lv/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-lv/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-lv/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-lv/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-mk/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-mk/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-mk/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-mk/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ml/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ml/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ml/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ml/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-mn/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-mn/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-mn/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-mn/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-mr/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-mr/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-mr/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-mr/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ms/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ms/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ms/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ms/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-my/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-my/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-my/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-my/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-nb/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-nb/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-nb/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-nb/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ne/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ne/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ne/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ne/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml b/modules/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-night-v31/colors.xml rename to modules/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml diff --git a/SettingsLib/SettingsTheme/res/values-night-v34/colors.xml b/modules/SettingsLib/SettingsTheme/res/values-night-v34/colors.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-night-v34/colors.xml rename to modules/SettingsLib/SettingsTheme/res/values-night-v34/colors.xml diff --git a/SettingsLib/SettingsTheme/res/values-night-v36/styles.xml b/modules/SettingsLib/SettingsTheme/res/values-night-v36/styles.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-night-v36/styles.xml rename to modules/SettingsLib/SettingsTheme/res/values-night-v36/styles.xml diff --git a/SettingsLib/SettingsTheme/res/values-night-v36/themes_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values-night-v36/themes_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-night-v36/themes_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values-night-v36/themes_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values-night/colors.xml b/modules/SettingsLib/SettingsTheme/res/values-night/colors.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-night/colors.xml rename to modules/SettingsLib/SettingsTheme/res/values-night/colors.xml diff --git a/SettingsLib/SettingsTheme/res/values-nl/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-nl/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-nl/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-nl/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-or/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-or/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-or/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-or/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-pa/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-pa/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-pa/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-pa/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-pl/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-pl/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-pl/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-pl/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-pt-rBR/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-pt-rBR/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-pt-rBR/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-pt-rBR/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-pt-rPT/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-pt-rPT/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-pt-rPT/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-pt-rPT/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-pt/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-pt/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-pt/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-pt/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ro/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ro/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ro/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ro/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ru/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ru/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ru/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ru/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-si/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-si/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-si/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-si/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-sk/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-sk/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-sk/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-sk/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-sl/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-sl/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-sl/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-sl/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-sq/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-sq/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-sq/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-sq/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-sr/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-sr/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-sr/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-sr/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-sv/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-sv/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-sv/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-sv/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-sw/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-sw/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-sw/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-sw/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ta/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ta/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ta/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ta/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-te/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-te/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-te/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-te/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-th/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-th/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-th/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-th/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-tl/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-tl/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-tl/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-tl/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-tr/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-tr/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-tr/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-tr/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-uk/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-uk/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-uk/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-uk/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-ur/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-ur/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-ur/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-ur/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-uz/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-uz/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-uz/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-uz/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-v31/colors.xml b/modules/SettingsLib/SettingsTheme/res/values-v31/colors.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v31/colors.xml rename to modules/SettingsLib/SettingsTheme/res/values-v31/colors.xml diff --git a/SettingsLib/SettingsTheme/res/values-v31/styles_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values-v31/styles_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v31/styles_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values-v31/styles_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values-v31/themes.xml b/modules/SettingsLib/SettingsTheme/res/values-v31/themes.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v31/themes.xml rename to modules/SettingsLib/SettingsTheme/res/values-v31/themes.xml diff --git a/SettingsLib/SettingsTheme/res/values-v33/styles_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values-v33/styles_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v33/styles_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values-v33/styles_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values-v33/themes.xml b/modules/SettingsLib/SettingsTheme/res/values-v33/themes.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v33/themes.xml rename to modules/SettingsLib/SettingsTheme/res/values-v33/themes.xml diff --git a/SettingsLib/SettingsTheme/res/values-v34/colors.xml b/modules/SettingsLib/SettingsTheme/res/values-v34/colors.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v34/colors.xml rename to modules/SettingsLib/SettingsTheme/res/values-v34/colors.xml diff --git a/SettingsLib/SettingsTheme/res/values-v36/styles.xml b/modules/SettingsLib/SettingsTheme/res/values-v36/styles.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v36/styles.xml rename to modules/SettingsLib/SettingsTheme/res/values-v36/styles.xml diff --git a/SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values-v36/themes.xml b/modules/SettingsLib/SettingsTheme/res/values-v36/themes.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v36/themes.xml rename to modules/SettingsLib/SettingsTheme/res/values-v36/themes.xml diff --git a/SettingsLib/SettingsTheme/res/values-v36/themes_bridge.xml b/modules/SettingsLib/SettingsTheme/res/values-v36/themes_bridge.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-v36/themes_bridge.xml rename to modules/SettingsLib/SettingsTheme/res/values-v36/themes_bridge.xml diff --git a/SettingsLib/SettingsTheme/res/values-vi/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-vi/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-vi/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-vi/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-zh-rCN/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-zh-rCN/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-zh-rCN/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-zh-rCN/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-zh-rHK/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-zh-rHK/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-zh-rHK/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-zh-rHK/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-zh-rTW/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-zh-rTW/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-zh-rTW/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-zh-rTW/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values-zu/strings.xml b/modules/SettingsLib/SettingsTheme/res/values-zu/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values-zu/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values-zu/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values/attrs.xml b/modules/SettingsLib/SettingsTheme/res/values/attrs.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/attrs.xml rename to modules/SettingsLib/SettingsTheme/res/values/attrs.xml diff --git a/SettingsLib/SettingsTheme/res/values/attrs_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values/attrs_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/attrs_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values/attrs_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values/colors.xml b/modules/SettingsLib/SettingsTheme/res/values/colors.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/colors.xml rename to modules/SettingsLib/SettingsTheme/res/values/colors.xml diff --git a/SettingsLib/SettingsTheme/res/values/config.xml b/modules/SettingsLib/SettingsTheme/res/values/config.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/config.xml rename to modules/SettingsLib/SettingsTheme/res/values/config.xml diff --git a/SettingsLib/SettingsTheme/res/values/dimens.xml b/modules/SettingsLib/SettingsTheme/res/values/dimens.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/dimens.xml rename to modules/SettingsLib/SettingsTheme/res/values/dimens.xml diff --git a/SettingsLib/SettingsTheme/res/values/dimens_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values/dimens_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/dimens_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values/dimens_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values/strings.xml b/modules/SettingsLib/SettingsTheme/res/values/strings.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/strings.xml rename to modules/SettingsLib/SettingsTheme/res/values/strings.xml diff --git a/SettingsLib/SettingsTheme/res/values/style_preference.xml b/modules/SettingsLib/SettingsTheme/res/values/style_preference.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/style_preference.xml rename to modules/SettingsLib/SettingsTheme/res/values/style_preference.xml diff --git a/SettingsLib/SettingsTheme/res/values/styles.xml b/modules/SettingsLib/SettingsTheme/res/values/styles.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/styles.xml rename to modules/SettingsLib/SettingsTheme/res/values/styles.xml diff --git a/SettingsLib/SettingsTheme/res/values/styles_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values/styles_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/styles_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values/styles_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values/styles_preference_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values/styles_preference_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/styles_preference_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values/styles_preference_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values/themes.xml b/modules/SettingsLib/SettingsTheme/res/values/themes.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/themes.xml rename to modules/SettingsLib/SettingsTheme/res/values/themes.xml diff --git a/SettingsLib/SettingsTheme/res/values/themes_bridge.xml b/modules/SettingsLib/SettingsTheme/res/values/themes_bridge.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/themes_bridge.xml rename to modules/SettingsLib/SettingsTheme/res/values/themes_bridge.xml diff --git a/SettingsLib/SettingsTheme/res/values/themes_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values/themes_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/themes_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values/themes_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/values/themes_preference_expressive.xml b/modules/SettingsLib/SettingsTheme/res/values/themes_preference_expressive.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/values/themes_preference_expressive.xml rename to modules/SettingsLib/SettingsTheme/res/values/themes_preference_expressive.xml diff --git a/SettingsLib/SettingsTheme/res/xml/settingslib_button_shape_state_list.xml b/modules/SettingsLib/SettingsTheme/res/xml/settingslib_button_shape_state_list.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/xml/settingslib_button_shape_state_list.xml rename to modules/SettingsLib/SettingsTheme/res/xml/settingslib_button_shape_state_list.xml diff --git a/SettingsLib/SettingsTheme/res/xml/settingslib_inner_corner_size_state_list.xml b/modules/SettingsLib/SettingsTheme/res/xml/settingslib_inner_corner_size_state_list.xml similarity index 100% rename from SettingsLib/SettingsTheme/res/xml/settingslib_inner_corner_size_state_list.xml rename to modules/SettingsLib/SettingsTheme/res/xml/settingslib_inner_corner_size_state_list.xml diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/DrawableStateLayout.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/DrawableStateLayout.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/DrawableStateLayout.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/DrawableStateLayout.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/DrawableStateLinearLayout.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/DrawableStateLinearLayout.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/DrawableStateLinearLayout.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/DrawableStateLinearLayout.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/Expandable.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/Expandable.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/Expandable.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/Expandable.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/ExpressiveDesignEnabledProvider.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/ExpressiveDesignEnabledProvider.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/ExpressiveDesignEnabledProvider.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/ExpressiveDesignEnabledProvider.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/GroupSectionDividerMixin.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/GroupSectionDividerMixin.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/GroupSectionDividerMixin.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/GroupSectionDividerMixin.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/LinkableTextView.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/LinkableTextView.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/LinkableTextView.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/LinkableTextView.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/NormalPaddingMixin.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/NormalPaddingMixin.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/NormalPaddingMixin.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/NormalPaddingMixin.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/OnScreenWidgetMixin.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/OnScreenWidgetMixin.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/OnScreenWidgetMixin.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/OnScreenWidgetMixin.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SetupWizardHelper.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SetupWizardHelper.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SetupWizardHelper.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SetupWizardHelper.kt diff --git a/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SpacePreference.kt b/modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SpacePreference.kt similarity index 100% rename from SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SpacePreference.kt rename to modules/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SpacePreference.kt diff --git a/SettingsLib/SliderPreference/Android.bp b/modules/SettingsLib/SliderPreference/Android.bp similarity index 100% rename from SettingsLib/SliderPreference/Android.bp rename to modules/SettingsLib/SliderPreference/Android.bp diff --git a/SettingsLib/SliderPreference/AndroidManifest.xml b/modules/SettingsLib/SliderPreference/AndroidManifest.xml similarity index 100% rename from SettingsLib/SliderPreference/AndroidManifest.xml rename to modules/SettingsLib/SliderPreference/AndroidManifest.xml diff --git a/SettingsLib/SliderPreference/build.gradle b/modules/SettingsLib/SliderPreference/build.gradle similarity index 86% rename from SettingsLib/SliderPreference/build.gradle rename to modules/SettingsLib/SliderPreference/build.gradle index 7c2c3e411..084a26bd5 100644 --- a/SettingsLib/SliderPreference/build.gradle +++ b/modules/SettingsLib/SliderPreference/build.gradle @@ -26,8 +26,8 @@ android { } dependencies { - api project(':SettingsLib-Preference') - api project(':SettingsLib-SettingsTheme') + api project(':SettingsLib:Preference') + api project(':SettingsLib:SettingsTheme') implementation(libs.annotation) implementation(libs.androidx.preference) } diff --git a/SettingsLib/SliderPreference/res/layout/settingslib_expressive_layout_slider.xml b/modules/SettingsLib/SliderPreference/res/layout/settingslib_expressive_layout_slider.xml similarity index 100% rename from SettingsLib/SliderPreference/res/layout/settingslib_expressive_layout_slider.xml rename to modules/SettingsLib/SliderPreference/res/layout/settingslib_expressive_layout_slider.xml diff --git a/SettingsLib/SliderPreference/res/layout/settingslib_expressive_preference_slider.xml b/modules/SettingsLib/SliderPreference/res/layout/settingslib_expressive_preference_slider.xml similarity index 100% rename from SettingsLib/SliderPreference/res/layout/settingslib_expressive_preference_slider.xml rename to modules/SettingsLib/SliderPreference/res/layout/settingslib_expressive_preference_slider.xml diff --git a/SettingsLib/SliderPreference/res/values/attrs_expressive.xml b/modules/SettingsLib/SliderPreference/res/values/attrs_expressive.xml similarity index 100% rename from SettingsLib/SliderPreference/res/values/attrs_expressive.xml rename to modules/SettingsLib/SliderPreference/res/values/attrs_expressive.xml diff --git a/SettingsLib/SliderPreference/res/values/dimens_expressive.xml b/modules/SettingsLib/SliderPreference/res/values/dimens_expressive.xml similarity index 100% rename from SettingsLib/SliderPreference/res/values/dimens_expressive.xml rename to modules/SettingsLib/SliderPreference/res/values/dimens_expressive.xml diff --git a/SettingsLib/SliderPreference/src/com/android/settingslib/widget/SliderPreference.java b/modules/SettingsLib/SliderPreference/src/com/android/settingslib/widget/SliderPreference.java similarity index 100% rename from SettingsLib/SliderPreference/src/com/android/settingslib/widget/SliderPreference.java rename to modules/SettingsLib/SliderPreference/src/com/android/settingslib/widget/SliderPreference.java diff --git a/SettingsLib/SliderPreference/src/com/android/settingslib/widget/SliderPreferenceBinding.kt b/modules/SettingsLib/SliderPreference/src/com/android/settingslib/widget/SliderPreferenceBinding.kt similarity index 100% rename from SettingsLib/SliderPreference/src/com/android/settingslib/widget/SliderPreferenceBinding.kt rename to modules/SettingsLib/SliderPreference/src/com/android/settingslib/widget/SliderPreferenceBinding.kt diff --git a/SettingsLib/TopIntroPreference/AndroidManifest.xml b/modules/SettingsLib/TopIntroPreference/AndroidManifest.xml similarity index 100% rename from SettingsLib/TopIntroPreference/AndroidManifest.xml rename to modules/SettingsLib/TopIntroPreference/AndroidManifest.xml diff --git a/SettingsLib/TopIntroPreference/build.gradle b/modules/SettingsLib/TopIntroPreference/build.gradle similarity index 92% rename from SettingsLib/TopIntroPreference/build.gradle rename to modules/SettingsLib/TopIntroPreference/build.gradle index 1ade7959d..0deea8379 100644 --- a/SettingsLib/TopIntroPreference/build.gradle +++ b/modules/SettingsLib/TopIntroPreference/build.gradle @@ -26,7 +26,7 @@ android { } dependencies { - api project(':SettingsLib-SettingsTheme') + api project(':SettingsLib:SettingsTheme') implementation(libs.annotation) implementation(libs.androidx.preference) } diff --git a/SettingsLib/TopIntroPreference/res/layout/settingslib_expressive_top_intro.xml b/modules/SettingsLib/TopIntroPreference/res/layout/settingslib_expressive_top_intro.xml similarity index 100% rename from SettingsLib/TopIntroPreference/res/layout/settingslib_expressive_top_intro.xml rename to modules/SettingsLib/TopIntroPreference/res/layout/settingslib_expressive_top_intro.xml diff --git a/SettingsLib/TopIntroPreference/src/com/android/settingslib/widget/TopIntroPreference.kt b/modules/SettingsLib/TopIntroPreference/src/com/android/settingslib/widget/TopIntroPreference.kt similarity index 100% rename from SettingsLib/TopIntroPreference/src/com/android/settingslib/widget/TopIntroPreference.kt rename to modules/SettingsLib/TopIntroPreference/src/com/android/settingslib/widget/TopIntroPreference.kt diff --git a/androidx-lib/build.gradle b/modules/androidx-lib/build.gradle similarity index 100% rename from androidx-lib/build.gradle rename to modules/androidx-lib/build.gradle diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/AnimationHandler.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/AnimationHandler.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/AnimationHandler.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/AnimationHandler.java diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/DynamicAnimation.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/DynamicAnimation.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/DynamicAnimation.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/DynamicAnimation.java diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/FlingAnimation.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/FlingAnimation.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/FlingAnimation.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/FlingAnimation.java diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/FloatPropertyCompat.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/FloatPropertyCompat.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/FloatPropertyCompat.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/FloatPropertyCompat.java diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/FloatValueHolder.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/FloatValueHolder.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/FloatValueHolder.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/FloatValueHolder.java diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/Force.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/Force.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/Force.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/Force.java diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/FrameCallbackScheduler.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/FrameCallbackScheduler.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/FrameCallbackScheduler.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/FrameCallbackScheduler.java diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/SpringAnimation.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/SpringAnimation.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/SpringAnimation.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/SpringAnimation.java diff --git a/androidx-lib/src/androidx/dynamicanimation/animation/SpringForce.java b/modules/androidx-lib/src/androidx/dynamicanimation/animation/SpringForce.java similarity index 100% rename from androidx-lib/src/androidx/dynamicanimation/animation/SpringForce.java rename to modules/androidx-lib/src/androidx/dynamicanimation/animation/SpringForce.java diff --git a/animationlib/Android.bp b/modules/animationlib/Android.bp similarity index 100% rename from animationlib/Android.bp rename to modules/animationlib/Android.bp diff --git a/animationlib/AndroidManifest.xml b/modules/animationlib/AndroidManifest.xml similarity index 100% rename from animationlib/AndroidManifest.xml rename to modules/animationlib/AndroidManifest.xml diff --git a/animationlib/TEST_MAPPING b/modules/animationlib/TEST_MAPPING similarity index 100% rename from animationlib/TEST_MAPPING rename to modules/animationlib/TEST_MAPPING diff --git a/animationlib/build.gradle b/modules/animationlib/build.gradle similarity index 100% rename from animationlib/build.gradle rename to modules/animationlib/build.gradle diff --git a/animationlib/res/interpolator/emphasized_accelerate_interpolator.xml b/modules/animationlib/res/interpolator/emphasized_accelerate_interpolator.xml similarity index 100% rename from animationlib/res/interpolator/emphasized_accelerate_interpolator.xml rename to modules/animationlib/res/interpolator/emphasized_accelerate_interpolator.xml diff --git a/animationlib/res/interpolator/emphasized_decelerate_interpolator.xml b/modules/animationlib/res/interpolator/emphasized_decelerate_interpolator.xml similarity index 100% rename from animationlib/res/interpolator/emphasized_decelerate_interpolator.xml rename to modules/animationlib/res/interpolator/emphasized_decelerate_interpolator.xml diff --git a/animationlib/res/interpolator/emphasized_interpolator.xml b/modules/animationlib/res/interpolator/emphasized_interpolator.xml similarity index 100% rename from animationlib/res/interpolator/emphasized_interpolator.xml rename to modules/animationlib/res/interpolator/emphasized_interpolator.xml diff --git a/animationlib/res/interpolator/standard_accelerate_interpolator.xml b/modules/animationlib/res/interpolator/standard_accelerate_interpolator.xml similarity index 100% rename from animationlib/res/interpolator/standard_accelerate_interpolator.xml rename to modules/animationlib/res/interpolator/standard_accelerate_interpolator.xml diff --git a/animationlib/res/interpolator/standard_decelerate_interpolator.xml b/modules/animationlib/res/interpolator/standard_decelerate_interpolator.xml similarity index 100% rename from animationlib/res/interpolator/standard_decelerate_interpolator.xml rename to modules/animationlib/res/interpolator/standard_decelerate_interpolator.xml diff --git a/animationlib/res/interpolator/standard_interpolator.xml b/modules/animationlib/res/interpolator/standard_interpolator.xml similarity index 100% rename from animationlib/res/interpolator/standard_interpolator.xml rename to modules/animationlib/res/interpolator/standard_interpolator.xml diff --git a/animationlib/res/values/ids.xml b/modules/animationlib/res/values/ids.xml similarity index 100% rename from animationlib/res/values/ids.xml rename to modules/animationlib/res/values/ids.xml diff --git a/animationlib/src/com/android/app/animation/Animations.kt b/modules/animationlib/src/com/android/app/animation/Animations.kt similarity index 100% rename from animationlib/src/com/android/app/animation/Animations.kt rename to modules/animationlib/src/com/android/app/animation/Animations.kt diff --git a/animationlib/src/com/android/app/animation/Interpolators.java b/modules/animationlib/src/com/android/app/animation/Interpolators.java similarity index 100% rename from animationlib/src/com/android/app/animation/Interpolators.java rename to modules/animationlib/src/com/android/app/animation/Interpolators.java diff --git a/animationlib/src/com/android/app/animation/InterpolatorsAndroidX.java b/modules/animationlib/src/com/android/app/animation/InterpolatorsAndroidX.java similarity index 100% rename from animationlib/src/com/android/app/animation/InterpolatorsAndroidX.java rename to modules/animationlib/src/com/android/app/animation/InterpolatorsAndroidX.java diff --git a/animationlib/src/com/android/app/animation/MathUtils.java b/modules/animationlib/src/com/android/app/animation/MathUtils.java similarity index 100% rename from animationlib/src/com/android/app/animation/MathUtils.java rename to modules/animationlib/src/com/android/app/animation/MathUtils.java diff --git a/animationlib/tests/AndroidManifest.xml b/modules/animationlib/tests/AndroidManifest.xml similarity index 100% rename from animationlib/tests/AndroidManifest.xml rename to modules/animationlib/tests/AndroidManifest.xml diff --git a/animationlib/tests/robolectric/config/robolectric.properties b/modules/animationlib/tests/robolectric/config/robolectric.properties similarity index 100% rename from animationlib/tests/robolectric/config/robolectric.properties rename to modules/animationlib/tests/robolectric/config/robolectric.properties diff --git a/animationlib/tests/src/com/android/app/animation/AnimationsTest.kt b/modules/animationlib/tests/src/com/android/app/animation/AnimationsTest.kt similarity index 100% rename from animationlib/tests/src/com/android/app/animation/AnimationsTest.kt rename to modules/animationlib/tests/src/com/android/app/animation/AnimationsTest.kt diff --git a/animationlib/tests/src/com/android/app/animation/InterpolatorResourcesTest.kt b/modules/animationlib/tests/src/com/android/app/animation/InterpolatorResourcesTest.kt similarity index 100% rename from animationlib/tests/src/com/android/app/animation/InterpolatorResourcesTest.kt rename to modules/animationlib/tests/src/com/android/app/animation/InterpolatorResourcesTest.kt diff --git a/animationlib/tests/src/com/android/app/animation/InterpolatorsAndroidXTest.kt b/modules/animationlib/tests/src/com/android/app/animation/InterpolatorsAndroidXTest.kt similarity index 100% rename from animationlib/tests/src/com/android/app/animation/InterpolatorsAndroidXTest.kt rename to modules/animationlib/tests/src/com/android/app/animation/InterpolatorsAndroidXTest.kt diff --git a/compatLib/README.md b/modules/compatLib/README.md similarity index 100% rename from compatLib/README.md rename to modules/compatLib/README.md diff --git a/compatLib/build.gradle b/modules/compatLib/build.gradle similarity index 100% rename from compatLib/build.gradle rename to modules/compatLib/build.gradle diff --git a/compatLib/compatLibVBaklava/build.gradle b/modules/compatLib/compatLibVBaklava/build.gradle similarity index 100% rename from compatLib/compatLibVBaklava/build.gradle rename to modules/compatLib/compatLibVBaklava/build.gradle diff --git a/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityManagerCompatVBaklava.java b/modules/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityManagerCompatVBaklava.java similarity index 100% rename from compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityManagerCompatVBaklava.java rename to modules/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityManagerCompatVBaklava.java diff --git a/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityOptionsCompatVBaklava.java b/modules/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityOptionsCompatVBaklava.java similarity index 100% rename from compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityOptionsCompatVBaklava.java rename to modules/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityOptionsCompatVBaklava.java diff --git a/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/QuickstepCompatFactoryVBaklava.java b/modules/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/QuickstepCompatFactoryVBaklava.java similarity index 100% rename from compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/QuickstepCompatFactoryVBaklava.java rename to modules/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/QuickstepCompatFactoryVBaklava.java diff --git a/compatLib/compatLibVQ/build.gradle b/modules/compatLib/compatLibVQ/build.gradle similarity index 100% rename from compatLib/compatLibVQ/build.gradle rename to modules/compatLib/compatLibVQ/build.gradle diff --git a/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/ActivityManagerCompatVQ.java b/modules/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/ActivityManagerCompatVQ.java similarity index 100% rename from compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/ActivityManagerCompatVQ.java rename to modules/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/ActivityManagerCompatVQ.java diff --git a/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/ActivityOptionsCompatVQ.java b/modules/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/ActivityOptionsCompatVQ.java similarity index 100% rename from compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/ActivityOptionsCompatVQ.java rename to modules/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/ActivityOptionsCompatVQ.java diff --git a/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/QuickstepCompatFactoryVQ.java b/modules/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/QuickstepCompatFactoryVQ.java similarity index 100% rename from compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/QuickstepCompatFactoryVQ.java rename to modules/compatLib/compatLibVQ/src/main/java/app/lawnchair/compatlib/ten/QuickstepCompatFactoryVQ.java diff --git a/compatLib/compatLibVR/build.gradle b/modules/compatLib/compatLibVR/build.gradle similarity index 100% rename from compatLib/compatLibVR/build.gradle rename to modules/compatLib/compatLibVR/build.gradle diff --git a/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/ActivityManagerCompatVR.java b/modules/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/ActivityManagerCompatVR.java similarity index 100% rename from compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/ActivityManagerCompatVR.java rename to modules/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/ActivityManagerCompatVR.java diff --git a/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/ActivityOptionsCompatVR.java b/modules/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/ActivityOptionsCompatVR.java similarity index 100% rename from compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/ActivityOptionsCompatVR.java rename to modules/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/ActivityOptionsCompatVR.java diff --git a/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/QuickstepCompatFactoryVR.java b/modules/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/QuickstepCompatFactoryVR.java similarity index 100% rename from compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/QuickstepCompatFactoryVR.java rename to modules/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/QuickstepCompatFactoryVR.java diff --git a/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/WindowManagerCompatVR.java b/modules/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/WindowManagerCompatVR.java similarity index 100% rename from compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/WindowManagerCompatVR.java rename to modules/compatLib/compatLibVR/src/main/java/app/lawnchair/compatlib/eleven/WindowManagerCompatVR.java diff --git a/compatLib/compatLibVS/build.gradle b/modules/compatLib/compatLibVS/build.gradle similarity index 100% rename from compatLib/compatLibVS/build.gradle rename to modules/compatLib/compatLibVS/build.gradle diff --git a/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/ActivityManagerCompatVS.java b/modules/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/ActivityManagerCompatVS.java similarity index 100% rename from compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/ActivityManagerCompatVS.java rename to modules/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/ActivityManagerCompatVS.java diff --git a/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/ActivityOptionsCompatVS.java b/modules/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/ActivityOptionsCompatVS.java similarity index 100% rename from compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/ActivityOptionsCompatVS.java rename to modules/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/ActivityOptionsCompatVS.java diff --git a/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/QuickstepCompatFactoryVS.java b/modules/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/QuickstepCompatFactoryVS.java similarity index 100% rename from compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/QuickstepCompatFactoryVS.java rename to modules/compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/QuickstepCompatFactoryVS.java diff --git a/compatLib/compatLibVT/build.gradle b/modules/compatLib/compatLibVT/build.gradle similarity index 100% rename from compatLib/compatLibVT/build.gradle rename to modules/compatLib/compatLibVT/build.gradle diff --git a/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/ActivityManagerCompatVT.java b/modules/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/ActivityManagerCompatVT.java similarity index 100% rename from compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/ActivityManagerCompatVT.java rename to modules/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/ActivityManagerCompatVT.java diff --git a/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/ActivityOptionsCompatVT.java b/modules/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/ActivityOptionsCompatVT.java similarity index 100% rename from compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/ActivityOptionsCompatVT.java rename to modules/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/ActivityOptionsCompatVT.java diff --git a/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/QuickstepCompatFactoryVT.java b/modules/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/QuickstepCompatFactoryVT.java similarity index 100% rename from compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/QuickstepCompatFactoryVT.java rename to modules/compatLib/compatLibVT/src/main/java/app/lawnchair/compatlib/thirteen/QuickstepCompatFactoryVT.java diff --git a/compatLib/compatLibVU/build.gradle b/modules/compatLib/compatLibVU/build.gradle similarity index 100% rename from compatLib/compatLibVU/build.gradle rename to modules/compatLib/compatLibVU/build.gradle diff --git a/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/ActivityManagerCompatVU.java b/modules/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/ActivityManagerCompatVU.java similarity index 100% rename from compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/ActivityManagerCompatVU.java rename to modules/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/ActivityManagerCompatVU.java diff --git a/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/ActivityOptionsCompatVU.java b/modules/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/ActivityOptionsCompatVU.java similarity index 100% rename from compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/ActivityOptionsCompatVU.java rename to modules/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/ActivityOptionsCompatVU.java diff --git a/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/QuickstepCompatFactoryVU.java b/modules/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/QuickstepCompatFactoryVU.java similarity index 100% rename from compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/QuickstepCompatFactoryVU.java rename to modules/compatLib/compatLibVU/src/main/java/app/lawnchair/compatlib/fourteen/QuickstepCompatFactoryVU.java diff --git a/compatLib/compatLibVV/build.gradle b/modules/compatLib/compatLibVV/build.gradle similarity index 100% rename from compatLib/compatLibVV/build.gradle rename to modules/compatLib/compatLibVV/build.gradle diff --git a/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/ActivityManagerCompatVV.java b/modules/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/ActivityManagerCompatVV.java similarity index 100% rename from compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/ActivityManagerCompatVV.java rename to modules/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/ActivityManagerCompatVV.java diff --git a/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/ActivityOptionsCompatVV.java b/modules/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/ActivityOptionsCompatVV.java similarity index 100% rename from compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/ActivityOptionsCompatVV.java rename to modules/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/ActivityOptionsCompatVV.java diff --git a/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/QuickstepCompatFactoryVV.java b/modules/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/QuickstepCompatFactoryVV.java similarity index 100% rename from compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/QuickstepCompatFactoryVV.java rename to modules/compatLib/compatLibVV/src/main/java/app/lawnchair/compatlib/fifteen/QuickstepCompatFactoryVV.java diff --git a/compatLib/src/main/java/android/internal/perfetto/protos/insets.proto b/modules/compatLib/src/main/java/android/internal/perfetto/protos/insets.proto similarity index 100% rename from compatLib/src/main/java/android/internal/perfetto/protos/insets.proto rename to modules/compatLib/src/main/java/android/internal/perfetto/protos/insets.proto diff --git a/compatLib/src/main/java/android/internal/perfetto/protos/insetssource.proto b/modules/compatLib/src/main/java/android/internal/perfetto/protos/insetssource.proto similarity index 100% rename from compatLib/src/main/java/android/internal/perfetto/protos/insetssource.proto rename to modules/compatLib/src/main/java/android/internal/perfetto/protos/insetssource.proto diff --git a/compatLib/src/main/java/android/internal/perfetto/protos/rect.proto b/modules/compatLib/src/main/java/android/internal/perfetto/protos/rect.proto similarity index 100% rename from compatLib/src/main/java/android/internal/perfetto/protos/rect.proto rename to modules/compatLib/src/main/java/android/internal/perfetto/protos/rect.proto diff --git a/compatLib/src/main/java/android/view/ISystemGestureExclusionListener.aidl b/modules/compatLib/src/main/java/android/view/ISystemGestureExclusionListener.aidl similarity index 100% rename from compatLib/src/main/java/android/view/ISystemGestureExclusionListener.aidl rename to modules/compatLib/src/main/java/android/view/ISystemGestureExclusionListener.aidl diff --git a/compatLib/src/main/java/android/view/InsetsFrameProvider.java b/modules/compatLib/src/main/java/android/view/InsetsFrameProvider.java similarity index 100% rename from compatLib/src/main/java/android/view/InsetsFrameProvider.java rename to modules/compatLib/src/main/java/android/view/InsetsFrameProvider.java diff --git a/compatLib/src/main/java/android/view/InsetsSource.java b/modules/compatLib/src/main/java/android/view/InsetsSource.java similarity index 100% rename from compatLib/src/main/java/android/view/InsetsSource.java rename to modules/compatLib/src/main/java/android/view/InsetsSource.java diff --git a/compatLib/src/main/java/android/window/IRemoteTransition.aidl b/modules/compatLib/src/main/java/android/window/IRemoteTransition.aidl similarity index 100% rename from compatLib/src/main/java/android/window/IRemoteTransition.aidl rename to modules/compatLib/src/main/java/android/window/IRemoteTransition.aidl diff --git a/compatLib/src/main/java/android/window/IRemoteTransitionFinishedCallback.aidl b/modules/compatLib/src/main/java/android/window/IRemoteTransitionFinishedCallback.aidl similarity index 100% rename from compatLib/src/main/java/android/window/IRemoteTransitionFinishedCallback.aidl rename to modules/compatLib/src/main/java/android/window/IRemoteTransitionFinishedCallback.aidl diff --git a/compatLib/src/main/java/android/window/OnBackAnimationCallback.java b/modules/compatLib/src/main/java/android/window/OnBackAnimationCallback.java similarity index 100% rename from compatLib/src/main/java/android/window/OnBackAnimationCallback.java rename to modules/compatLib/src/main/java/android/window/OnBackAnimationCallback.java diff --git a/compatLib/src/main/java/android/window/OnBackInvokedCallback.java b/modules/compatLib/src/main/java/android/window/OnBackInvokedCallback.java similarity index 100% rename from compatLib/src/main/java/android/window/OnBackInvokedCallback.java rename to modules/compatLib/src/main/java/android/window/OnBackInvokedCallback.java diff --git a/compatLib/src/main/java/android/window/RemoteTransition.aidl b/modules/compatLib/src/main/java/android/window/RemoteTransition.aidl similarity index 100% rename from compatLib/src/main/java/android/window/RemoteTransition.aidl rename to modules/compatLib/src/main/java/android/window/RemoteTransition.aidl diff --git a/compatLib/src/main/java/android/window/RemoteTransition.java b/modules/compatLib/src/main/java/android/window/RemoteTransition.java similarity index 100% rename from compatLib/src/main/java/android/window/RemoteTransition.java rename to modules/compatLib/src/main/java/android/window/RemoteTransition.java diff --git a/compatLib/src/main/java/android/window/RemoteTransitionStub.java b/modules/compatLib/src/main/java/android/window/RemoteTransitionStub.java similarity index 100% rename from compatLib/src/main/java/android/window/RemoteTransitionStub.java rename to modules/compatLib/src/main/java/android/window/RemoteTransitionStub.java diff --git a/compatLib/src/main/java/android/window/TransitionFilter.aidl b/modules/compatLib/src/main/java/android/window/TransitionFilter.aidl similarity index 100% rename from compatLib/src/main/java/android/window/TransitionFilter.aidl rename to modules/compatLib/src/main/java/android/window/TransitionFilter.aidl diff --git a/compatLib/src/main/java/android/window/TransitionFilter.java b/modules/compatLib/src/main/java/android/window/TransitionFilter.java similarity index 100% rename from compatLib/src/main/java/android/window/TransitionFilter.java rename to modules/compatLib/src/main/java/android/window/TransitionFilter.java diff --git a/compatLib/src/main/java/android/window/TransitionInfo.aidl b/modules/compatLib/src/main/java/android/window/TransitionInfo.aidl similarity index 100% rename from compatLib/src/main/java/android/window/TransitionInfo.aidl rename to modules/compatLib/src/main/java/android/window/TransitionInfo.aidl diff --git a/compatLib/src/main/java/android/window/TransitionInfo.java b/modules/compatLib/src/main/java/android/window/TransitionInfo.java similarity index 100% rename from compatLib/src/main/java/android/window/TransitionInfo.java rename to modules/compatLib/src/main/java/android/window/TransitionInfo.java diff --git a/compatLib/src/main/java/android/window/WindowAnimationState.aidl b/modules/compatLib/src/main/java/android/window/WindowAnimationState.aidl similarity index 100% rename from compatLib/src/main/java/android/window/WindowAnimationState.aidl rename to modules/compatLib/src/main/java/android/window/WindowAnimationState.aidl diff --git a/compatLib/src/main/java/app/lawnchair/compatlib/ActivityManagerCompat.java b/modules/compatLib/src/main/java/app/lawnchair/compatlib/ActivityManagerCompat.java similarity index 100% rename from compatLib/src/main/java/app/lawnchair/compatlib/ActivityManagerCompat.java rename to modules/compatLib/src/main/java/app/lawnchair/compatlib/ActivityManagerCompat.java diff --git a/compatLib/src/main/java/app/lawnchair/compatlib/ActivityOptionsCompat.java b/modules/compatLib/src/main/java/app/lawnchair/compatlib/ActivityOptionsCompat.java similarity index 100% rename from compatLib/src/main/java/app/lawnchair/compatlib/ActivityOptionsCompat.java rename to modules/compatLib/src/main/java/app/lawnchair/compatlib/ActivityOptionsCompat.java diff --git a/compatLib/src/main/java/app/lawnchair/compatlib/QuickstepCompatFactory.java b/modules/compatLib/src/main/java/app/lawnchair/compatlib/QuickstepCompatFactory.java similarity index 100% rename from compatLib/src/main/java/app/lawnchair/compatlib/QuickstepCompatFactory.java rename to modules/compatLib/src/main/java/app/lawnchair/compatlib/QuickstepCompatFactory.java diff --git a/compatLib/src/main/java/app/lawnchair/compatlib/RecentsAnimationRunnerCompat.java b/modules/compatLib/src/main/java/app/lawnchair/compatlib/RecentsAnimationRunnerCompat.java similarity index 100% rename from compatLib/src/main/java/app/lawnchair/compatlib/RecentsAnimationRunnerCompat.java rename to modules/compatLib/src/main/java/app/lawnchair/compatlib/RecentsAnimationRunnerCompat.java diff --git a/compatLib/src/main/java/app/lawnchair/compatlib/RemoteTransitionCompat.java b/modules/compatLib/src/main/java/app/lawnchair/compatlib/RemoteTransitionCompat.java similarity index 100% rename from compatLib/src/main/java/app/lawnchair/compatlib/RemoteTransitionCompat.java rename to modules/compatLib/src/main/java/app/lawnchair/compatlib/RemoteTransitionCompat.java diff --git a/compatLib/src/main/java/app/lawnchair/compatlib/utils/BitmapUtil.java b/modules/compatLib/src/main/java/app/lawnchair/compatlib/utils/BitmapUtil.java similarity index 100% rename from compatLib/src/main/java/app/lawnchair/compatlib/utils/BitmapUtil.java rename to modules/compatLib/src/main/java/app/lawnchair/compatlib/utils/BitmapUtil.java diff --git a/flagslib/build.gradle b/modules/flagslib/build.gradle similarity index 100% rename from flagslib/build.gradle rename to modules/flagslib/build.gradle diff --git a/flagslib/src/com/android/launcher3/CustomFeatureFlags.java b/modules/flagslib/src/com/android/launcher3/CustomFeatureFlags.java similarity index 100% rename from flagslib/src/com/android/launcher3/CustomFeatureFlags.java rename to modules/flagslib/src/com/android/launcher3/CustomFeatureFlags.java diff --git a/flagslib/src/com/android/launcher3/FakeFeatureFlagsImpl.java b/modules/flagslib/src/com/android/launcher3/FakeFeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/launcher3/FakeFeatureFlagsImpl.java rename to modules/flagslib/src/com/android/launcher3/FakeFeatureFlagsImpl.java diff --git a/flagslib/src/com/android/launcher3/FeatureFlags.java b/modules/flagslib/src/com/android/launcher3/FeatureFlags.java similarity index 100% rename from flagslib/src/com/android/launcher3/FeatureFlags.java rename to modules/flagslib/src/com/android/launcher3/FeatureFlags.java diff --git a/flagslib/src/com/android/launcher3/FeatureFlagsImpl.java b/modules/flagslib/src/com/android/launcher3/FeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/launcher3/FeatureFlagsImpl.java rename to modules/flagslib/src/com/android/launcher3/FeatureFlagsImpl.java diff --git a/flagslib/src/com/android/launcher3/Flags.java b/modules/flagslib/src/com/android/launcher3/Flags.java similarity index 100% rename from flagslib/src/com/android/launcher3/Flags.java rename to modules/flagslib/src/com/android/launcher3/Flags.java diff --git a/flagslib/src/com/android/quickstep/util/DeviceConfigHelper.kt b/modules/flagslib/src/com/android/quickstep/util/DeviceConfigHelper.kt similarity index 100% rename from flagslib/src/com/android/quickstep/util/DeviceConfigHelper.kt rename to modules/flagslib/src/com/android/quickstep/util/DeviceConfigHelper.kt diff --git a/flagslib/src/com/android/systemui/CustomFeatureFlags.java b/modules/flagslib/src/com/android/systemui/CustomFeatureFlags.java similarity index 100% rename from flagslib/src/com/android/systemui/CustomFeatureFlags.java rename to modules/flagslib/src/com/android/systemui/CustomFeatureFlags.java diff --git a/flagslib/src/com/android/systemui/FakeFeatureFlagsImpl.java b/modules/flagslib/src/com/android/systemui/FakeFeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/systemui/FakeFeatureFlagsImpl.java rename to modules/flagslib/src/com/android/systemui/FakeFeatureFlagsImpl.java diff --git a/flagslib/src/com/android/systemui/FeatureFlags.java b/modules/flagslib/src/com/android/systemui/FeatureFlags.java similarity index 100% rename from flagslib/src/com/android/systemui/FeatureFlags.java rename to modules/flagslib/src/com/android/systemui/FeatureFlags.java diff --git a/flagslib/src/com/android/systemui/FeatureFlagsImpl.java b/modules/flagslib/src/com/android/systemui/FeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/systemui/FeatureFlagsImpl.java rename to modules/flagslib/src/com/android/systemui/FeatureFlagsImpl.java diff --git a/flagslib/src/com/android/systemui/Flags.java b/modules/flagslib/src/com/android/systemui/Flags.java similarity index 100% rename from flagslib/src/com/android/systemui/Flags.java rename to modules/flagslib/src/com/android/systemui/Flags.java diff --git a/flagslib/src/com/android/systemui/shared/CustomFeatureFlags.java b/modules/flagslib/src/com/android/systemui/shared/CustomFeatureFlags.java similarity index 100% rename from flagslib/src/com/android/systemui/shared/CustomFeatureFlags.java rename to modules/flagslib/src/com/android/systemui/shared/CustomFeatureFlags.java diff --git a/flagslib/src/com/android/systemui/shared/FakeFeatureFlagsImpl.java b/modules/flagslib/src/com/android/systemui/shared/FakeFeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/systemui/shared/FakeFeatureFlagsImpl.java rename to modules/flagslib/src/com/android/systemui/shared/FakeFeatureFlagsImpl.java diff --git a/flagslib/src/com/android/systemui/shared/FeatureFlags.java b/modules/flagslib/src/com/android/systemui/shared/FeatureFlags.java similarity index 100% rename from flagslib/src/com/android/systemui/shared/FeatureFlags.java rename to modules/flagslib/src/com/android/systemui/shared/FeatureFlags.java diff --git a/flagslib/src/com/android/systemui/shared/FeatureFlagsImpl.java b/modules/flagslib/src/com/android/systemui/shared/FeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/systemui/shared/FeatureFlagsImpl.java rename to modules/flagslib/src/com/android/systemui/shared/FeatureFlagsImpl.java diff --git a/flagslib/src/com/android/systemui/shared/Flags.java b/modules/flagslib/src/com/android/systemui/shared/Flags.java similarity index 100% rename from flagslib/src/com/android/systemui/shared/Flags.java rename to modules/flagslib/src/com/android/systemui/shared/Flags.java diff --git a/flagslib/src/com/android/window/flags/CustomFeatureFlags.java b/modules/flagslib/src/com/android/window/flags/CustomFeatureFlags.java similarity index 100% rename from flagslib/src/com/android/window/flags/CustomFeatureFlags.java rename to modules/flagslib/src/com/android/window/flags/CustomFeatureFlags.java diff --git a/flagslib/src/com/android/window/flags/FakeFeatureFlagsImpl.java b/modules/flagslib/src/com/android/window/flags/FakeFeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/window/flags/FakeFeatureFlagsImpl.java rename to modules/flagslib/src/com/android/window/flags/FakeFeatureFlagsImpl.java diff --git a/flagslib/src/com/android/window/flags/FeatureFlags.java b/modules/flagslib/src/com/android/window/flags/FeatureFlags.java similarity index 100% rename from flagslib/src/com/android/window/flags/FeatureFlags.java rename to modules/flagslib/src/com/android/window/flags/FeatureFlags.java diff --git a/flagslib/src/com/android/window/flags/FeatureFlagsImpl.java b/modules/flagslib/src/com/android/window/flags/FeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/window/flags/FeatureFlagsImpl.java rename to modules/flagslib/src/com/android/window/flags/FeatureFlagsImpl.java diff --git a/flagslib/src/com/android/window/flags/Flags.java b/modules/flagslib/src/com/android/window/flags/Flags.java similarity index 100% rename from flagslib/src/com/android/window/flags/Flags.java rename to modules/flagslib/src/com/android/window/flags/Flags.java diff --git a/flagslib/src/com/android/wm/shell/CustomFeatureFlags.java b/modules/flagslib/src/com/android/wm/shell/CustomFeatureFlags.java similarity index 100% rename from flagslib/src/com/android/wm/shell/CustomFeatureFlags.java rename to modules/flagslib/src/com/android/wm/shell/CustomFeatureFlags.java diff --git a/flagslib/src/com/android/wm/shell/FakeFeatureFlagsImpl.java b/modules/flagslib/src/com/android/wm/shell/FakeFeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/wm/shell/FakeFeatureFlagsImpl.java rename to modules/flagslib/src/com/android/wm/shell/FakeFeatureFlagsImpl.java diff --git a/flagslib/src/com/android/wm/shell/FeatureFlags.java b/modules/flagslib/src/com/android/wm/shell/FeatureFlags.java similarity index 100% rename from flagslib/src/com/android/wm/shell/FeatureFlags.java rename to modules/flagslib/src/com/android/wm/shell/FeatureFlags.java diff --git a/flagslib/src/com/android/wm/shell/FeatureFlagsImpl.java b/modules/flagslib/src/com/android/wm/shell/FeatureFlagsImpl.java similarity index 100% rename from flagslib/src/com/android/wm/shell/FeatureFlagsImpl.java rename to modules/flagslib/src/com/android/wm/shell/FeatureFlagsImpl.java diff --git a/flagslib/src/com/android/wm/shell/Flags.java b/modules/flagslib/src/com/android/wm/shell/Flags.java similarity index 100% rename from flagslib/src/com/android/wm/shell/Flags.java rename to modules/flagslib/src/com/android/wm/shell/Flags.java diff --git a/hidden-api/build.gradle b/modules/hidden-api/build.gradle similarity index 100% rename from hidden-api/build.gradle rename to modules/hidden-api/build.gradle diff --git a/hidden-api/src/main/java/android/animation/AnimationHandler.java b/modules/hidden-api/src/main/java/android/animation/AnimationHandler.java similarity index 100% rename from hidden-api/src/main/java/android/animation/AnimationHandler.java rename to modules/hidden-api/src/main/java/android/animation/AnimationHandler.java diff --git a/hidden-api/src/main/java/android/app/IActivityTaskManager.java b/modules/hidden-api/src/main/java/android/app/IActivityTaskManager.java similarity index 100% rename from hidden-api/src/main/java/android/app/IActivityTaskManager.java rename to modules/hidden-api/src/main/java/android/app/IActivityTaskManager.java diff --git a/hidden-api/src/main/java/android/app/IActivityTaskManagerHidden.java b/modules/hidden-api/src/main/java/android/app/IActivityTaskManagerHidden.java similarity index 100% rename from hidden-api/src/main/java/android/app/IActivityTaskManagerHidden.java rename to modules/hidden-api/src/main/java/android/app/IActivityTaskManagerHidden.java diff --git a/hidden-api/src/main/java/android/app/search/SearchTarget.java b/modules/hidden-api/src/main/java/android/app/search/SearchTarget.java similarity index 100% rename from hidden-api/src/main/java/android/app/search/SearchTarget.java rename to modules/hidden-api/src/main/java/android/app/search/SearchTarget.java diff --git a/hidden-api/src/main/java/android/view/RemoteAnimationAdapter.java b/modules/hidden-api/src/main/java/android/view/RemoteAnimationAdapter.java similarity index 100% rename from hidden-api/src/main/java/android/view/RemoteAnimationAdapter.java rename to modules/hidden-api/src/main/java/android/view/RemoteAnimationAdapter.java diff --git a/hidden-api/src/main/java/com/android/internal/util/ScreenshotRequest.java b/modules/hidden-api/src/main/java/com/android/internal/util/ScreenshotRequest.java similarity index 100% rename from hidden-api/src/main/java/com/android/internal/util/ScreenshotRequest.java rename to modules/hidden-api/src/main/java/com/android/internal/util/ScreenshotRequest.java diff --git a/hidden-api/src/main/java/com/android/internal/view/RotationPolicy.java b/modules/hidden-api/src/main/java/com/android/internal/view/RotationPolicy.java similarity index 100% rename from hidden-api/src/main/java/com/android/internal/view/RotationPolicy.java rename to modules/hidden-api/src/main/java/com/android/internal/view/RotationPolicy.java diff --git a/iconloaderlib/.gitignore b/modules/iconloaderlib/.gitignore similarity index 100% rename from iconloaderlib/.gitignore rename to modules/iconloaderlib/.gitignore diff --git a/iconloaderlib/Android.bp b/modules/iconloaderlib/Android.bp similarity index 100% rename from iconloaderlib/Android.bp rename to modules/iconloaderlib/Android.bp diff --git a/iconloaderlib/AndroidManifest.xml b/modules/iconloaderlib/AndroidManifest.xml similarity index 100% rename from iconloaderlib/AndroidManifest.xml rename to modules/iconloaderlib/AndroidManifest.xml diff --git a/iconloaderlib/build.gradle b/modules/iconloaderlib/build.gradle similarity index 95% rename from iconloaderlib/build.gradle rename to modules/iconloaderlib/build.gradle index 153e85bb0..e72f4e1bd 100644 --- a/iconloaderlib/build.gradle +++ b/modules/iconloaderlib/build.gradle @@ -29,5 +29,5 @@ android { dependencies { implementation libs.androidx.palette.ktx implementation libs.androidx.tracing - compileOnly project(':flags') + compileOnly project(':flagslib') } diff --git a/iconloaderlib/res/drawable/ic_clone_app_badge.xml b/modules/iconloaderlib/res/drawable/ic_clone_app_badge.xml similarity index 100% rename from iconloaderlib/res/drawable/ic_clone_app_badge.xml rename to modules/iconloaderlib/res/drawable/ic_clone_app_badge.xml diff --git a/iconloaderlib/res/drawable/ic_instant_app_badge.xml b/modules/iconloaderlib/res/drawable/ic_instant_app_badge.xml similarity index 100% rename from iconloaderlib/res/drawable/ic_instant_app_badge.xml rename to modules/iconloaderlib/res/drawable/ic_instant_app_badge.xml diff --git a/iconloaderlib/res/drawable/ic_private_profile_app_badge.xml b/modules/iconloaderlib/res/drawable/ic_private_profile_app_badge.xml similarity index 100% rename from iconloaderlib/res/drawable/ic_private_profile_app_badge.xml rename to modules/iconloaderlib/res/drawable/ic_private_profile_app_badge.xml diff --git a/iconloaderlib/res/drawable/ic_work_app_badge.xml b/modules/iconloaderlib/res/drawable/ic_work_app_badge.xml similarity index 100% rename from iconloaderlib/res/drawable/ic_work_app_badge.xml rename to modules/iconloaderlib/res/drawable/ic_work_app_badge.xml diff --git a/iconloaderlib/res/values-night-v31/colors.xml b/modules/iconloaderlib/res/values-night-v31/colors.xml similarity index 100% rename from iconloaderlib/res/values-night-v31/colors.xml rename to modules/iconloaderlib/res/values-night-v31/colors.xml diff --git a/iconloaderlib/res/values-night/colors.xml b/modules/iconloaderlib/res/values-night/colors.xml similarity index 100% rename from iconloaderlib/res/values-night/colors.xml rename to modules/iconloaderlib/res/values-night/colors.xml diff --git a/iconloaderlib/res/values-v31/colors.xml b/modules/iconloaderlib/res/values-v31/colors.xml similarity index 100% rename from iconloaderlib/res/values-v31/colors.xml rename to modules/iconloaderlib/res/values-v31/colors.xml diff --git a/iconloaderlib/res/values/attrs.xml b/modules/iconloaderlib/res/values/attrs.xml similarity index 100% rename from iconloaderlib/res/values/attrs.xml rename to modules/iconloaderlib/res/values/attrs.xml diff --git a/iconloaderlib/res/values/colors.xml b/modules/iconloaderlib/res/values/colors.xml similarity index 100% rename from iconloaderlib/res/values/colors.xml rename to modules/iconloaderlib/res/values/colors.xml diff --git a/iconloaderlib/res/values/config.xml b/modules/iconloaderlib/res/values/config.xml similarity index 100% rename from iconloaderlib/res/values/config.xml rename to modules/iconloaderlib/res/values/config.xml diff --git a/iconloaderlib/res/values/dimens.xml b/modules/iconloaderlib/res/values/dimens.xml similarity index 100% rename from iconloaderlib/res/values/dimens.xml rename to modules/iconloaderlib/res/values/dimens.xml diff --git a/iconloaderlib/src/app/lawnchair/icons/ClockMetadata.kt b/modules/iconloaderlib/src/app/lawnchair/icons/ClockMetadata.kt similarity index 100% rename from iconloaderlib/src/app/lawnchair/icons/ClockMetadata.kt rename to modules/iconloaderlib/src/app/lawnchair/icons/ClockMetadata.kt diff --git a/iconloaderlib/src/app/lawnchair/icons/CustomAdaptiveIconDrawable.java b/modules/iconloaderlib/src/app/lawnchair/icons/CustomAdaptiveIconDrawable.java similarity index 100% rename from iconloaderlib/src/app/lawnchair/icons/CustomAdaptiveIconDrawable.java rename to modules/iconloaderlib/src/app/lawnchair/icons/CustomAdaptiveIconDrawable.java diff --git a/iconloaderlib/src/app/lawnchair/icons/ExtendedBitmapDrawable.kt b/modules/iconloaderlib/src/app/lawnchair/icons/ExtendedBitmapDrawable.kt similarity index 100% rename from iconloaderlib/src/app/lawnchair/icons/ExtendedBitmapDrawable.kt rename to modules/iconloaderlib/src/app/lawnchair/icons/ExtendedBitmapDrawable.kt diff --git a/iconloaderlib/src/app/lawnchair/icons/FixedScaleDrawable.java b/modules/iconloaderlib/src/app/lawnchair/icons/FixedScaleDrawable.java similarity index 100% rename from iconloaderlib/src/app/lawnchair/icons/FixedScaleDrawable.java rename to modules/iconloaderlib/src/app/lawnchair/icons/FixedScaleDrawable.java diff --git a/iconloaderlib/src/app/lawnchair/icons/IconPreferences.kt b/modules/iconloaderlib/src/app/lawnchair/icons/IconPreferences.kt similarity index 100% rename from iconloaderlib/src/app/lawnchair/icons/IconPreferences.kt rename to modules/iconloaderlib/src/app/lawnchair/icons/IconPreferences.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java b/modules/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/BitmapRenderer.java b/modules/iconloaderlib/src/com/android/launcher3/icons/BitmapRenderer.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/BitmapRenderer.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/BitmapRenderer.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/BubbleIconFactory.java b/modules/iconloaderlib/src/com/android/launcher3/icons/BubbleIconFactory.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/BubbleIconFactory.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/BubbleIconFactory.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java b/modules/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java b/modules/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java b/modules/iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java b/modules/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java b/modules/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/IconProvider.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/MonochromeIconFactory.java b/modules/iconloaderlib/src/com/android/launcher3/icons/MonochromeIconFactory.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/MonochromeIconFactory.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/MonochromeIconFactory.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/PlaceHolderIconDrawable.java b/modules/iconloaderlib/src/com/android/launcher3/icons/PlaceHolderIconDrawable.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/PlaceHolderIconDrawable.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/PlaceHolderIconDrawable.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/RoundDrawableWrapper.java b/modules/iconloaderlib/src/com/android/launcher3/icons/RoundDrawableWrapper.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/RoundDrawableWrapper.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/RoundDrawableWrapper.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java b/modules/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/ThemedBitmap.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/ThemedBitmap.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/ThemedBitmap.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/ThemedBitmap.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/UserBadgeDrawable.java b/modules/iconloaderlib/src/com/android/launcher3/icons/UserBadgeDrawable.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/UserBadgeDrawable.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/UserBadgeDrawable.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/AppInfoCachingLogic.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/AppInfoCachingLogic.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/AppInfoCachingLogic.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/AppInfoCachingLogic.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/CacheLookupFlag.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/CacheLookupFlag.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/CacheLookupFlag.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/CacheLookupFlag.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/CachedObject.java b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/CachedObject.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/CachedObject.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/CachedObject.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/CachedObjectCachingLogic.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/CachedObjectCachingLogic.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/CachedObjectCachingLogic.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/CachedObjectCachingLogic.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/LauncherActivityCachingLogic.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/LauncherActivityCachingLogic.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/LauncherActivityCachingLogic.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/LauncherActivityCachingLogic.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/StaticFlags.java b/modules/iconloaderlib/src/com/android/launcher3/icons/cache/StaticFlags.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/cache/StaticFlags.java rename to modules/iconloaderlib/src/com/android/launcher3/icons/cache/StaticFlags.java diff --git a/iconloaderlib/src/com/android/launcher3/icons/mono/MonoIconThemeController.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/mono/MonoIconThemeController.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/mono/MonoIconThemeController.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/mono/MonoIconThemeController.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/mono/MonoThemedBitmap.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/mono/MonoThemedBitmap.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/mono/MonoThemedBitmap.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/mono/MonoThemedBitmap.kt diff --git a/iconloaderlib/src/com/android/launcher3/icons/mono/ThemedIconDrawable.kt b/modules/iconloaderlib/src/com/android/launcher3/icons/mono/ThemedIconDrawable.kt similarity index 100% rename from iconloaderlib/src/com/android/launcher3/icons/mono/ThemedIconDrawable.kt rename to modules/iconloaderlib/src/com/android/launcher3/icons/mono/ThemedIconDrawable.kt diff --git a/iconloaderlib/src/com/android/launcher3/util/ComponentKey.java b/modules/iconloaderlib/src/com/android/launcher3/util/ComponentKey.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/util/ComponentKey.java rename to modules/iconloaderlib/src/com/android/launcher3/util/ComponentKey.java diff --git a/iconloaderlib/src/com/android/launcher3/util/FlagOp.java b/modules/iconloaderlib/src/com/android/launcher3/util/FlagOp.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/util/FlagOp.java rename to modules/iconloaderlib/src/com/android/launcher3/util/FlagOp.java diff --git a/iconloaderlib/src/com/android/launcher3/util/NoLocaleSQLiteHelper.java b/modules/iconloaderlib/src/com/android/launcher3/util/NoLocaleSQLiteHelper.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/util/NoLocaleSQLiteHelper.java rename to modules/iconloaderlib/src/com/android/launcher3/util/NoLocaleSQLiteHelper.java diff --git a/iconloaderlib/src/com/android/launcher3/util/SQLiteCacheHelper.java b/modules/iconloaderlib/src/com/android/launcher3/util/SQLiteCacheHelper.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/util/SQLiteCacheHelper.java rename to modules/iconloaderlib/src/com/android/launcher3/util/SQLiteCacheHelper.java diff --git a/iconloaderlib/src/com/android/launcher3/util/SafeCloseable.java b/modules/iconloaderlib/src/com/android/launcher3/util/SafeCloseable.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/util/SafeCloseable.java rename to modules/iconloaderlib/src/com/android/launcher3/util/SafeCloseable.java diff --git a/iconloaderlib/src/com/android/launcher3/util/UserIconInfo.java b/modules/iconloaderlib/src/com/android/launcher3/util/UserIconInfo.java similarity index 100% rename from iconloaderlib/src/com/android/launcher3/util/UserIconInfo.java rename to modules/iconloaderlib/src/com/android/launcher3/util/UserIconInfo.java diff --git a/iconloaderlib/src_full_lib/com/android/launcher3/icons/IconFactory.java b/modules/iconloaderlib/src_full_lib/com/android/launcher3/icons/IconFactory.java similarity index 100% rename from iconloaderlib/src_full_lib/com/android/launcher3/icons/IconFactory.java rename to modules/iconloaderlib/src_full_lib/com/android/launcher3/icons/IconFactory.java diff --git a/iconloaderlib/src_full_lib/com/android/launcher3/icons/SimpleIconCache.java b/modules/iconloaderlib/src_full_lib/com/android/launcher3/icons/SimpleIconCache.java similarity index 100% rename from iconloaderlib/src_full_lib/com/android/launcher3/icons/SimpleIconCache.java rename to modules/iconloaderlib/src_full_lib/com/android/launcher3/icons/SimpleIconCache.java diff --git a/msdllib/Android.bp b/modules/msdllib/Android.bp similarity index 100% rename from msdllib/Android.bp rename to modules/msdllib/Android.bp diff --git a/msdllib/AndroidManifest.xml b/modules/msdllib/AndroidManifest.xml similarity index 100% rename from msdllib/AndroidManifest.xml rename to modules/msdllib/AndroidManifest.xml diff --git a/msdllib/TEST_MAPPING b/modules/msdllib/TEST_MAPPING similarity index 100% rename from msdllib/TEST_MAPPING rename to modules/msdllib/TEST_MAPPING diff --git a/msdllib/build.gradle.kts b/modules/msdllib/build.gradle.kts similarity index 100% rename from msdllib/build.gradle.kts rename to modules/msdllib/build.gradle.kts diff --git a/msdllib/src/com/google/android/msdl/data/model/HapticComposition.kt b/modules/msdllib/src/com/google/android/msdl/data/model/HapticComposition.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/data/model/HapticComposition.kt rename to modules/msdllib/src/com/google/android/msdl/data/model/HapticComposition.kt diff --git a/msdllib/src/com/google/android/msdl/data/model/HapticToken.kt b/modules/msdllib/src/com/google/android/msdl/data/model/HapticToken.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/data/model/HapticToken.kt rename to modules/msdllib/src/com/google/android/msdl/data/model/HapticToken.kt diff --git a/msdllib/src/com/google/android/msdl/data/model/MSDLToken.kt b/modules/msdllib/src/com/google/android/msdl/data/model/MSDLToken.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/data/model/MSDLToken.kt rename to modules/msdllib/src/com/google/android/msdl/data/model/MSDLToken.kt diff --git a/msdllib/src/com/google/android/msdl/data/model/SoundToken.kt b/modules/msdllib/src/com/google/android/msdl/data/model/SoundToken.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/data/model/SoundToken.kt rename to modules/msdllib/src/com/google/android/msdl/data/model/SoundToken.kt diff --git a/msdllib/src/com/google/android/msdl/data/repository/MSDLRepository.kt b/modules/msdllib/src/com/google/android/msdl/data/repository/MSDLRepository.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/data/repository/MSDLRepository.kt rename to modules/msdllib/src/com/google/android/msdl/data/repository/MSDLRepository.kt diff --git a/msdllib/src/com/google/android/msdl/data/repository/MSDLRepositoryImpl.kt b/modules/msdllib/src/com/google/android/msdl/data/repository/MSDLRepositoryImpl.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/data/repository/MSDLRepositoryImpl.kt rename to modules/msdllib/src/com/google/android/msdl/data/repository/MSDLRepositoryImpl.kt diff --git a/msdllib/src/com/google/android/msdl/domain/EmptyMSDLPlayer.kt b/modules/msdllib/src/com/google/android/msdl/domain/EmptyMSDLPlayer.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/domain/EmptyMSDLPlayer.kt rename to modules/msdllib/src/com/google/android/msdl/domain/EmptyMSDLPlayer.kt diff --git a/msdllib/src/com/google/android/msdl/domain/InteractionProperties.kt b/modules/msdllib/src/com/google/android/msdl/domain/InteractionProperties.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/domain/InteractionProperties.kt rename to modules/msdllib/src/com/google/android/msdl/domain/InteractionProperties.kt diff --git a/msdllib/src/com/google/android/msdl/domain/MSDLPlayer.kt b/modules/msdllib/src/com/google/android/msdl/domain/MSDLPlayer.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/domain/MSDLPlayer.kt rename to modules/msdllib/src/com/google/android/msdl/domain/MSDLPlayer.kt diff --git a/msdllib/src/com/google/android/msdl/domain/MSDLPlayerImpl.kt b/modules/msdllib/src/com/google/android/msdl/domain/MSDLPlayerImpl.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/domain/MSDLPlayerImpl.kt rename to modules/msdllib/src/com/google/android/msdl/domain/MSDLPlayerImpl.kt diff --git a/msdllib/src/com/google/android/msdl/logging/MSDLEvent.kt b/modules/msdllib/src/com/google/android/msdl/logging/MSDLEvent.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/logging/MSDLEvent.kt rename to modules/msdllib/src/com/google/android/msdl/logging/MSDLEvent.kt diff --git a/msdllib/src/com/google/android/msdl/logging/MSDLHistoryLogger.kt b/modules/msdllib/src/com/google/android/msdl/logging/MSDLHistoryLogger.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/logging/MSDLHistoryLogger.kt rename to modules/msdllib/src/com/google/android/msdl/logging/MSDLHistoryLogger.kt diff --git a/msdllib/src/com/google/android/msdl/logging/MSDLHistoryLoggerImpl.kt b/modules/msdllib/src/com/google/android/msdl/logging/MSDLHistoryLoggerImpl.kt similarity index 100% rename from msdllib/src/com/google/android/msdl/logging/MSDLHistoryLoggerImpl.kt rename to modules/msdllib/src/com/google/android/msdl/logging/MSDLHistoryLoggerImpl.kt diff --git a/msdllib/tests/AndroidManifest.xml b/modules/msdllib/tests/AndroidManifest.xml similarity index 100% rename from msdllib/tests/AndroidManifest.xml rename to modules/msdllib/tests/AndroidManifest.xml diff --git a/msdllib/tests/src/com/google/android/msdl/data/repository/MSDLRepositoryImplTest.kt b/modules/msdllib/tests/src/com/google/android/msdl/data/repository/MSDLRepositoryImplTest.kt similarity index 100% rename from msdllib/tests/src/com/google/android/msdl/data/repository/MSDLRepositoryImplTest.kt rename to modules/msdllib/tests/src/com/google/android/msdl/data/repository/MSDLRepositoryImplTest.kt diff --git a/msdllib/tests/src/com/google/android/msdl/domain/FakeVibrator.kt b/modules/msdllib/tests/src/com/google/android/msdl/domain/FakeVibrator.kt similarity index 100% rename from msdllib/tests/src/com/google/android/msdl/domain/FakeVibrator.kt rename to modules/msdllib/tests/src/com/google/android/msdl/domain/FakeVibrator.kt diff --git a/msdllib/tests/src/com/google/android/msdl/domain/MSDLPlayerImplTest.kt b/modules/msdllib/tests/src/com/google/android/msdl/domain/MSDLPlayerImplTest.kt similarity index 100% rename from msdllib/tests/src/com/google/android/msdl/domain/MSDLPlayerImplTest.kt rename to modules/msdllib/tests/src/com/google/android/msdl/domain/MSDLPlayerImplTest.kt diff --git a/msdllib/tests/src/com/google/android/msdl/logging/MSDLHistoryLoggerImplTest.kt b/modules/msdllib/tests/src/com/google/android/msdl/logging/MSDLHistoryLoggerImplTest.kt similarity index 100% rename from msdllib/tests/src/com/google/android/msdl/logging/MSDLHistoryLoggerImplTest.kt rename to modules/msdllib/tests/src/com/google/android/msdl/logging/MSDLHistoryLoggerImplTest.kt diff --git a/shared/Android.bp b/modules/shared/Android.bp similarity index 100% rename from shared/Android.bp rename to modules/shared/Android.bp diff --git a/shared/AndroidManifest.xml b/modules/shared/AndroidManifest.xml similarity index 100% rename from shared/AndroidManifest.xml rename to modules/shared/AndroidManifest.xml diff --git a/shared/OWNERS b/modules/shared/OWNERS similarity index 100% rename from shared/OWNERS rename to modules/shared/OWNERS diff --git a/shared/build.gradle.kts b/modules/shared/build.gradle.kts similarity index 100% rename from shared/build.gradle.kts rename to modules/shared/build.gradle.kts diff --git a/shared/res/drawable/floating_dismiss_background.xml b/modules/shared/res/drawable/floating_dismiss_background.xml similarity index 100% rename from shared/res/drawable/floating_dismiss_background.xml rename to modules/shared/res/drawable/floating_dismiss_background.xml diff --git a/shared/res/drawable/floating_dismiss_ic_close.xml b/modules/shared/res/drawable/floating_dismiss_ic_close.xml similarity index 100% rename from shared/res/drawable/floating_dismiss_ic_close.xml rename to modules/shared/res/drawable/floating_dismiss_ic_close.xml diff --git a/shared/res/values/strings.xml b/modules/shared/res/values/strings.xml similarity index 100% rename from shared/res/values/strings.xml rename to modules/shared/res/values/strings.xml diff --git a/shared/src/com/android/launcher3/testing/shared/ResourceUtils.java b/modules/shared/src/com/android/launcher3/testing/shared/ResourceUtils.java similarity index 100% rename from shared/src/com/android/launcher3/testing/shared/ResourceUtils.java rename to modules/shared/src/com/android/launcher3/testing/shared/ResourceUtils.java diff --git a/shared/src/com/android/launcher3/testing/shared/TestProtocol.java b/modules/shared/src/com/android/launcher3/testing/shared/TestProtocol.java similarity index 100% rename from shared/src/com/android/launcher3/testing/shared/TestProtocol.java rename to modules/shared/src/com/android/launcher3/testing/shared/TestProtocol.java diff --git a/systemUIPluginCore/Android.bp b/modules/systemUIPluginCore/Android.bp similarity index 100% rename from systemUIPluginCore/Android.bp rename to modules/systemUIPluginCore/Android.bp diff --git a/systemUIPluginCore/AndroidManifest.xml b/modules/systemUIPluginCore/AndroidManifest.xml similarity index 100% rename from systemUIPluginCore/AndroidManifest.xml rename to modules/systemUIPluginCore/AndroidManifest.xml diff --git a/systemUIPluginCore/build.gradle b/modules/systemUIPluginCore/build.gradle similarity index 100% rename from systemUIPluginCore/build.gradle rename to modules/systemUIPluginCore/build.gradle diff --git a/systemUIPluginCore/proguard.flags b/modules/systemUIPluginCore/proguard.flags similarity index 100% rename from systemUIPluginCore/proguard.flags rename to modules/systemUIPluginCore/proguard.flags diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/Plugin.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/Plugin.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/Plugin.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/Plugin.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/PluginFragment.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/PluginFragment.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/PluginFragment.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/PluginFragment.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/PluginLifecycleManager.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/PluginLifecycleManager.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/PluginLifecycleManager.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/PluginLifecycleManager.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/PluginListener.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/PluginListener.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/PluginListener.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/PluginListener.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/PluginManager.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/PluginManager.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/PluginManager.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/PluginManager.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Dependencies.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Dependencies.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/Dependencies.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Dependencies.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/DependsOn.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/DependsOn.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/DependsOn.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/DependsOn.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/ProvidesInterface.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/ProvidesInterface.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/ProvidesInterface.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/ProvidesInterface.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requirements.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requirements.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requirements.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requirements.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requires.java b/modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requires.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requires.java rename to modules/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requires.java diff --git a/wm_shared/Android.bp b/modules/wm_shared/Android.bp similarity index 100% rename from wm_shared/Android.bp rename to modules/wm_shared/Android.bp diff --git a/wm_shared/AndroidManifest.xml b/modules/wm_shared/AndroidManifest.xml similarity index 100% rename from wm_shared/AndroidManifest.xml rename to modules/wm_shared/AndroidManifest.xml diff --git a/wm_shared/build.gradle.kts b/modules/wm_shared/build.gradle.kts similarity index 96% rename from wm_shared/build.gradle.kts rename to modules/wm_shared/build.gradle.kts index 014b4a499..c4b80568d 100644 --- a/wm_shared/build.gradle.kts +++ b/modules/wm_shared/build.gradle.kts @@ -36,5 +36,5 @@ dependencies { implementation("androidx.dynamicanimation:dynamicanimation-ktx:1.1.0") implementation("androidx.window:window:1.5.1") implementation("javax.inject:javax.inject:1") - compileOnly(project(":flags")) + compileOnly(project(":flagslib")) } diff --git a/wm_shared/res/color/bubble_drop_target_background_color.xml b/modules/wm_shared/res/color/bubble_drop_target_background_color.xml similarity index 100% rename from wm_shared/res/color/bubble_drop_target_background_color.xml rename to modules/wm_shared/res/color/bubble_drop_target_background_color.xml diff --git a/wm_shared/res/drawable/bubble_drop_target_background.xml b/modules/wm_shared/res/drawable/bubble_drop_target_background.xml similarity index 100% rename from wm_shared/res/drawable/bubble_drop_target_background.xml rename to modules/wm_shared/res/drawable/bubble_drop_target_background.xml diff --git a/wm_shared/res/drawable/floating_dismiss_background.xml b/modules/wm_shared/res/drawable/floating_dismiss_background.xml similarity index 100% rename from wm_shared/res/drawable/floating_dismiss_background.xml rename to modules/wm_shared/res/drawable/floating_dismiss_background.xml diff --git a/wm_shared/res/drawable/floating_dismiss_ic_close.xml b/modules/wm_shared/res/drawable/floating_dismiss_ic_close.xml similarity index 100% rename from wm_shared/res/drawable/floating_dismiss_ic_close.xml rename to modules/wm_shared/res/drawable/floating_dismiss_ic_close.xml diff --git a/wm_shared/res/values/config.xml b/modules/wm_shared/res/values/config.xml similarity index 100% rename from wm_shared/res/values/config.xml rename to modules/wm_shared/res/values/config.xml diff --git a/wm_shared/res/values/dimen.xml b/modules/wm_shared/res/values/dimen.xml similarity index 100% rename from wm_shared/res/values/dimen.xml rename to modules/wm_shared/res/values/dimen.xml diff --git a/wm_shared/res/values/strings.xml b/modules/wm_shared/res/values/strings.xml similarity index 100% rename from wm_shared/res/values/strings.xml rename to modules/wm_shared/res/values/strings.xml diff --git a/wm_shared/src/com/android/wm/shell/shared/CounterRotator.java b/modules/wm_shared/src/com/android/wm/shell/shared/CounterRotator.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/CounterRotator.java rename to modules/wm_shared/src/com/android/wm/shell/shared/CounterRotator.java diff --git a/wm_shared/src/com/android/wm/shell/shared/FocusTransitionListener.java b/modules/wm_shared/src/com/android/wm/shell/shared/FocusTransitionListener.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/FocusTransitionListener.java rename to modules/wm_shared/src/com/android/wm/shell/shared/FocusTransitionListener.java diff --git a/wm_shared/src/com/android/wm/shell/shared/GroupedTaskInfo.aidl b/modules/wm_shared/src/com/android/wm/shell/shared/GroupedTaskInfo.aidl similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/GroupedTaskInfo.aidl rename to modules/wm_shared/src/com/android/wm/shell/shared/GroupedTaskInfo.aidl diff --git a/wm_shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java b/modules/wm_shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java rename to modules/wm_shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java diff --git a/wm_shared/src/com/android/wm/shell/shared/IFocusTransitionListener.aidl b/modules/wm_shared/src/com/android/wm/shell/shared/IFocusTransitionListener.aidl similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/IFocusTransitionListener.aidl rename to modules/wm_shared/src/com/android/wm/shell/shared/IFocusTransitionListener.aidl diff --git a/wm_shared/src/com/android/wm/shell/shared/IHomeTransitionListener.aidl b/modules/wm_shared/src/com/android/wm/shell/shared/IHomeTransitionListener.aidl similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/IHomeTransitionListener.aidl rename to modules/wm_shared/src/com/android/wm/shell/shared/IHomeTransitionListener.aidl diff --git a/wm_shared/src/com/android/wm/shell/shared/IShellTransitions.aidl b/modules/wm_shared/src/com/android/wm/shell/shared/IShellTransitions.aidl similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/IShellTransitions.aidl rename to modules/wm_shared/src/com/android/wm/shell/shared/IShellTransitions.aidl diff --git a/wm_shared/src/com/android/wm/shell/shared/ShellSharedConstants.java b/modules/wm_shared/src/com/android/wm/shell/shared/ShellSharedConstants.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/ShellSharedConstants.java rename to modules/wm_shared/src/com/android/wm/shell/shared/ShellSharedConstants.java diff --git a/wm_shared/src/com/android/wm/shell/shared/ShellTransitions.java b/modules/wm_shared/src/com/android/wm/shell/shared/ShellTransitions.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/ShellTransitions.java rename to modules/wm_shared/src/com/android/wm/shell/shared/ShellTransitions.java diff --git a/wm_shared/src/com/android/wm/shell/shared/TransactionPool.java b/modules/wm_shared/src/com/android/wm/shell/shared/TransactionPool.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/TransactionPool.java rename to modules/wm_shared/src/com/android/wm/shell/shared/TransactionPool.java diff --git a/wm_shared/src/com/android/wm/shell/shared/TransitionUtil.java b/modules/wm_shared/src/com/android/wm/shell/shared/TransitionUtil.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/TransitionUtil.java rename to modules/wm_shared/src/com/android/wm/shell/shared/TransitionUtil.java diff --git a/wm_shared/src/com/android/wm/shell/shared/TriangleShape.java b/modules/wm_shared/src/com/android/wm/shell/shared/TriangleShape.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/TriangleShape.java rename to modules/wm_shared/src/com/android/wm/shell/shared/TriangleShape.java diff --git a/wm_shared/src/com/android/wm/shell/shared/TypefaceUtils.kt b/modules/wm_shared/src/com/android/wm/shell/shared/TypefaceUtils.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/TypefaceUtils.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/TypefaceUtils.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/animation/Interpolators.java b/modules/wm_shared/src/com/android/wm/shell/shared/animation/Interpolators.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/animation/Interpolators.java rename to modules/wm_shared/src/com/android/wm/shell/shared/animation/Interpolators.java diff --git a/wm_shared/src/com/android/wm/shell/shared/animation/MinimizeAnimator.kt b/modules/wm_shared/src/com/android/wm/shell/shared/animation/MinimizeAnimator.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/animation/MinimizeAnimator.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/animation/MinimizeAnimator.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/animation/PhysicsAnimator.kt b/modules/wm_shared/src/com/android/wm/shell/shared/animation/PhysicsAnimator.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/animation/PhysicsAnimator.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/animation/PhysicsAnimator.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/animation/PhysicsAnimatorTestUtils.kt b/modules/wm_shared/src/com/android/wm/shell/shared/animation/PhysicsAnimatorTestUtils.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/animation/PhysicsAnimatorTestUtils.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/animation/PhysicsAnimatorTestUtils.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/animation/WindowAnimator.kt b/modules/wm_shared/src/com/android/wm/shell/shared/animation/WindowAnimator.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/animation/WindowAnimator.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/animation/WindowAnimator.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/annotations/ChoreographerSfVsync.java b/modules/wm_shared/src/com/android/wm/shell/shared/annotations/ChoreographerSfVsync.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/annotations/ChoreographerSfVsync.java rename to modules/wm_shared/src/com/android/wm/shell/shared/annotations/ChoreographerSfVsync.java diff --git a/wm_shared/src/com/android/wm/shell/shared/annotations/ExternalMainThread.java b/modules/wm_shared/src/com/android/wm/shell/shared/annotations/ExternalMainThread.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/annotations/ExternalMainThread.java rename to modules/wm_shared/src/com/android/wm/shell/shared/annotations/ExternalMainThread.java diff --git a/wm_shared/src/com/android/wm/shell/shared/annotations/ExternalThread.java b/modules/wm_shared/src/com/android/wm/shell/shared/annotations/ExternalThread.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/annotations/ExternalThread.java rename to modules/wm_shared/src/com/android/wm/shell/shared/annotations/ExternalThread.java diff --git a/wm_shared/src/com/android/wm/shell/shared/annotations/ShellAnimationThread.java b/modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellAnimationThread.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/annotations/ShellAnimationThread.java rename to modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellAnimationThread.java diff --git a/wm_shared/src/com/android/wm/shell/shared/annotations/ShellBackgroundThread.java b/modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellBackgroundThread.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/annotations/ShellBackgroundThread.java rename to modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellBackgroundThread.java diff --git a/wm_shared/src/com/android/wm/shell/shared/annotations/ShellDesktopThread.java b/modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellDesktopThread.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/annotations/ShellDesktopThread.java rename to modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellDesktopThread.java diff --git a/wm_shared/src/com/android/wm/shell/shared/annotations/ShellMainThread.java b/modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellMainThread.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/annotations/ShellMainThread.java rename to modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellMainThread.java diff --git a/wm_shared/src/com/android/wm/shell/shared/annotations/ShellSplashscreenThread.java b/modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellSplashscreenThread.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/annotations/ShellSplashscreenThread.java rename to modules/wm_shared/src/com/android/wm/shell/shared/annotations/ShellSplashscreenThread.java diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BaseBubblePinController.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BaseBubblePinController.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BaseBubblePinController.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BaseBubblePinController.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleAnythingFlagHelper.java b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleAnythingFlagHelper.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleAnythingFlagHelper.java rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleAnythingFlagHelper.java diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarLocation.aidl b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarLocation.aidl similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarLocation.aidl rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarLocation.aidl diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarLocation.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarLocation.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarLocation.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarLocation.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarUpdate.java b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarUpdate.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarUpdate.java rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleBarUpdate.java diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleConstants.java b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleConstants.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleConstants.java rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleConstants.java diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleDropTargetBoundsProvider.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleDropTargetBoundsProvider.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleDropTargetBoundsProvider.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleDropTargetBoundsProvider.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleInfo.java b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleInfo.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleInfo.java rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubbleInfo.java diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubblePopupDrawable.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubblePopupDrawable.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubblePopupDrawable.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubblePopupDrawable.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/BubblePopupView.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubblePopupView.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/BubblePopupView.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/BubblePopupView.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/ContextUtils.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/ContextUtils.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/ContextUtils.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/ContextUtils.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/DeviceConfig.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DeviceConfig.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/DeviceConfig.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DeviceConfig.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/DismissCircleView.java b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DismissCircleView.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/DismissCircleView.java rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DismissCircleView.java diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/DismissView.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DismissView.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/DismissView.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DismissView.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/DragZone.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DragZone.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/DragZone.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DragZone.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/DragZoneFactory.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DragZoneFactory.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/DragZoneFactory.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DragZoneFactory.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/DraggedObject.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DraggedObject.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/DraggedObject.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DraggedObject.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/DropTargetManager.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DropTargetManager.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/DropTargetManager.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DropTargetManager.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/DropTargetView.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DropTargetView.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/DropTargetView.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/DropTargetView.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/FlyoutDrawableLoader.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/FlyoutDrawableLoader.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/FlyoutDrawableLoader.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/FlyoutDrawableLoader.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/OWNERS b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/OWNERS similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/OWNERS rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/OWNERS diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/ParcelableFlyoutMessage.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/ParcelableFlyoutMessage.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/ParcelableFlyoutMessage.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/ParcelableFlyoutMessage.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/RelativeTouchListener.kt b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/RelativeTouchListener.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/RelativeTouchListener.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/RelativeTouchListener.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/bubbles/RemovedBubble.java b/modules/wm_shared/src/com/android/wm/shell/shared/bubbles/RemovedBubble.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/bubbles/RemovedBubble.java rename to modules/wm_shared/src/com/android/wm/shell/shared/bubbles/RemovedBubble.java diff --git a/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeCompatPolicy.kt b/modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeCompatPolicy.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeCompatPolicy.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeCompatPolicy.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java b/modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java rename to modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java diff --git a/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.aidl b/modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.aidl similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.aidl rename to modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.aidl diff --git a/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.kt b/modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopTaskToFrontReason.aidl b/modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopTaskToFrontReason.aidl similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopTaskToFrontReason.aidl rename to modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopTaskToFrontReason.aidl diff --git a/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopTaskToFrontReason.kt b/modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopTaskToFrontReason.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopTaskToFrontReason.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/DesktopTaskToFrontReason.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/desktopmode/OWNERS b/modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/OWNERS similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/desktopmode/OWNERS rename to modules/wm_shared/src/com/android/wm/shell/shared/desktopmode/OWNERS diff --git a/wm_shared/src/com/android/wm/shell/shared/draganddrop/DragAndDropConstants.java b/modules/wm_shared/src/com/android/wm/shell/shared/draganddrop/DragAndDropConstants.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/draganddrop/DragAndDropConstants.java rename to modules/wm_shared/src/com/android/wm/shell/shared/draganddrop/DragAndDropConstants.java diff --git a/wm_shared/src/com/android/wm/shell/shared/handles/RegionSamplingHelper.java b/modules/wm_shared/src/com/android/wm/shell/shared/handles/RegionSamplingHelper.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/handles/RegionSamplingHelper.java rename to modules/wm_shared/src/com/android/wm/shell/shared/handles/RegionSamplingHelper.java diff --git a/wm_shared/src/com/android/wm/shell/shared/magnetictarget/MagnetizedObject.kt b/modules/wm_shared/src/com/android/wm/shell/shared/magnetictarget/MagnetizedObject.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/magnetictarget/MagnetizedObject.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/magnetictarget/MagnetizedObject.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt b/modules/wm_shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt rename to modules/wm_shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt diff --git a/wm_shared/src/com/android/wm/shell/shared/pip/OWNERS b/modules/wm_shared/src/com/android/wm/shell/shared/pip/OWNERS similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/pip/OWNERS rename to modules/wm_shared/src/com/android/wm/shell/shared/pip/OWNERS diff --git a/wm_shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java b/modules/wm_shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java rename to modules/wm_shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java diff --git a/wm_shared/src/com/android/wm/shell/shared/split/OWNERS b/modules/wm_shared/src/com/android/wm/shell/shared/split/OWNERS similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/split/OWNERS rename to modules/wm_shared/src/com/android/wm/shell/shared/split/OWNERS diff --git a/wm_shared/src/com/android/wm/shell/shared/split/SplitBounds.java b/modules/wm_shared/src/com/android/wm/shell/shared/split/SplitBounds.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/split/SplitBounds.java rename to modules/wm_shared/src/com/android/wm/shell/shared/split/SplitBounds.java diff --git a/wm_shared/src/com/android/wm/shell/shared/split/SplitScreenConstants.java b/modules/wm_shared/src/com/android/wm/shell/shared/split/SplitScreenConstants.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/split/SplitScreenConstants.java rename to modules/wm_shared/src/com/android/wm/shell/shared/split/SplitScreenConstants.java diff --git a/wm_shared/src/com/android/wm/shell/shared/startingsurface/SplashScreenExitAnimationUtils.java b/modules/wm_shared/src/com/android/wm/shell/shared/startingsurface/SplashScreenExitAnimationUtils.java similarity index 100% rename from wm_shared/src/com/android/wm/shell/shared/startingsurface/SplashScreenExitAnimationUtils.java rename to modules/wm_shared/src/com/android/wm/shell/shared/startingsurface/SplashScreenExitAnimationUtils.java diff --git a/settings.gradle b/settings.gradle index 4e41b0f68..b613d2c35 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,58 +31,50 @@ dependencyResolutionManagement { } -include ':IconLoader' -project(':IconLoader').projectDir = new File(rootDir, 'iconloaderlib') +// Previous explicit form, kept in case a module ever needs a project name that differs +// from its folder (that is what the map used to provide): +//// All modules; any child folder holding a build script becomes a subproject of it. +//[ +// 'IconLoader' : 'iconloaderlib', +// 'Animation' : 'animationlib', +// 'Shared' : 'shared', +// 'WMShared' : 'wm_shared', +// 'msdl' : 'msdllib', +// 'flags' : 'flagslib', +// 'HiddenApi' : 'hidden-api', +// 'systemUIPluginCore': 'systemUIPluginCore', +// 'androidx-lib' : 'androidx-lib', +// 'compatLib' : 'compatLib', +// 'SettingsLib' : 'SettingsLib' +//].each { name, dir -> +// File root = new File(rootDir, "modules/$dir") +// include ":$name" +// project(":$name").projectDir = root // set before children resolve against it +// root.listFiles() +// .findAll { new File(it, 'build.gradle').exists() || new File(it, 'build.gradle.kts').exists() } +// .sort { it.name } +// .each { include ":$name:${it.name}" } +//} -include ':Animation' -project(':Animation').projectDir = new File(rootDir, 'animationlib') +// Included so the IDE marks modules/ as a module too; it holds no build script itself. +include ':modules' -include ':Shared' -project(':Shared').projectDir = new File(rootDir, 'shared') +final File MODULES_DIR = new File(rootDir, 'modules') -include ':WMShared' -project(':WMShared').projectDir = new File(rootDir, 'wm_shared') +// Folders under modules/ that are not projects themselves but hold subprojects. +final List MODULE_CONTAINERS = [ + 'SettingsLib' +] -include ':msdl' -project(':msdl').projectDir = new File(rootDir, 'msdllib') +def isProject = { File f -> + f.isDirectory() && (new File(f, 'build.gradle').exists() || new File(f, 'build.gradle.kts').exists()) +} -include ':flags' -project(':flags').projectDir = new File(rootDir, 'flagslib') - -include ':HiddenApi' -project(':HiddenApi').projectDir = new File(rootDir, 'hidden-api') - -include ':SettingsLib-SettingsTheme' -project(':SettingsLib-SettingsTheme').projectDir = new File(rootDir, 'SettingsLib/SettingsTheme') -include ':SettingsLib-DataStore' -project(':SettingsLib-DataStore').projectDir = new File(rootDir, 'SettingsLib/DataStore') -include ':SettingsLib-Metadata' -project(':SettingsLib-Metadata').projectDir = new File(rootDir, 'SettingsLib/Metadata') -include ':SettingsLib-Preference' -project(':SettingsLib-Preference').projectDir = new File(rootDir, 'SettingsLib/Preference') -include ':SettingsLib-SliderPreference' -project(':SettingsLib-SliderPreference').projectDir = new File(rootDir, 'SettingsLib/SliderPreference') -include ':SettingsLib-SelectorWithWidgetPreference' -project(':SettingsLib-SelectorWithWidgetPreference').projectDir = new File(rootDir, 'SettingsLib/SelectorWithWidgetPreference') -include ':SettingsLib-ExpandablePreference' -project(':SettingsLib-ExpandablePreference').projectDir = new File(rootDir, 'SettingsLib/ExpandablePreference') -include ':SettingsLib-SegmentedButtonPreference' -project(':SettingsLib-SegmentedButtonPreference').projectDir = new File(rootDir, 'SettingsLib/SegmentedButtonPreference') -include ':SettingsLib-MainSwitchPreference' -project(':SettingsLib-MainSwitchPreference').projectDir = new File(rootDir, 'SettingsLib/MainSwitchPreference') -include ':SettingsLib-TopIntroPreference' -project(':SettingsLib-TopIntroPreference').projectDir = new File(rootDir, 'SettingsLib/TopIntroPreference') -include ':SettingsLib-FooterPreference' -project(':SettingsLib-FooterPreference').projectDir = new File(rootDir, 'SettingsLib/FooterPreference') - -include ':compatLib' -include ':compatLib:compatLibVQ' -include ':compatLib:compatLibVR' -include ':compatLib:compatLibVS' -include ':compatLib:compatLibVT' -include ':compatLib:compatLibVU' -include ':compatLib:compatLibVV' -include ':compatLib:compatLibVBaklava' - -include ':systemUIPluginCore' -include ':androidx-lib' +// A folder under modules/ is a project if it has a build script (or is listed as a container); +// only then are its children scanned for subprojects. +MODULES_DIR.listFiles().findAll { it.isDirectory() }.sort { it.name }.each { File dir -> + if (!isProject(dir) && !(dir.name in MODULE_CONTAINERS)) return + include ":${dir.name}" + project(":${dir.name}").projectDir = dir // set before children resolve against it + dir.listFiles().findAll(isProject).sort { it.name }.each { include ":${dir.name}:${it.name}" } +}