Merge "Import translations. DO NOT MERGE ANYWHERE" into main
diff --git a/Android.bp b/Android.bp
index 8676f26..44ec269 100644
--- a/Android.bp
+++ b/Android.bp
@@ -93,7 +93,6 @@
name: "ThemePicker_defaults",
static_libs: [
"ThemePickerLib",
- "ThemePickerOverridesLib",
"hilt_android",
],
@@ -115,6 +114,14 @@
system_ext_specific: true,
}
+java_defaults {
+ name: "ThemePicker_defaults_with_overrides",
+ defaults: ["ThemePicker_defaults"],
+ static_libs: [
+ "ThemePickerOverridesLib",
+ ],
+}
+
prebuilt_etc {
name: "android.software.theme_picker.xml",
system_ext_specific: true,
diff --git a/src_override/com/android/wallpaper/module/AppModule.kt b/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
similarity index 92%
rename from src_override/com/android/wallpaper/module/AppModule.kt
rename to src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
index e784386..989773b 100644
--- a/src_override/com/android/wallpaper/module/AppModule.kt
+++ b/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.wallpaper.module
+package com.android.wallpaper.modules
import android.content.Context
import com.android.customization.model.color.ColorCustomizationManager
@@ -23,6 +23,9 @@
import com.android.customization.module.ThemePickerInjector
import com.android.customization.module.logging.ThemesUserEventLogger
import com.android.customization.module.logging.ThemesUserEventLoggerImpl
+import com.android.wallpaper.module.DefaultPartnerProvider
+import com.android.wallpaper.module.PartnerProvider
+import com.android.wallpaper.module.WallpaperPreferences
import com.android.wallpaper.module.logging.UserEventLogger
import com.android.wallpaper.picker.preview.data.util.DefaultLiveWallpaperDownloader
import com.android.wallpaper.picker.preview.data.util.LiveWallpaperDownloader
@@ -38,7 +41,7 @@
@Module
@InstallIn(SingletonComponent::class)
-abstract class AppModule {
+abstract class ThemePickerAppModule {
@Binds @Singleton abstract fun bindInjector(impl: ThemePickerInjector): CustomizationInjector
@Binds
diff --git a/tests/Android.bp b/tests/Android.bp
index 690a1b6..5b12a4a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -41,13 +41,13 @@
srcs: [
":ThemePickerTests_srcs",
":WallpaperPicker2Tests_srcs",
- "module/src/com/android/customization/TestModule.kt",
],
exclude_srcs: [":ThemePicker_src_prod"],
static_libs: [
"WallpaperPicker2TestLib",
"WallpaperPicker2TestRunner",
"ThemePickerTestLib",
+ "ThemePickerTestModule",
"SystemUICustomizationTestUtils",
"androidx.test.espresso.core",
"androidx.test.espresso.contrib",
diff --git a/tests/module/Android.bp b/tests/module/Android.bp
index c174699..f865832 100644
--- a/tests/module/Android.bp
+++ b/tests/module/Android.bp
@@ -19,7 +19,8 @@
android_library {
name: "ThemePickerTestModule",
- srcs: ["src/com/android/customization/TestModule.kt"],
+ defaults: ["ThemePicker_defaults_with_overrides"],
+ srcs: ["src/com/android/wallpaper/ThemePickerTestModule.kt"],
static_libs: [
"ThemePickerTestLib",
"hilt_android",
diff --git a/tests/module/src/com/android/customization/TestModule.kt b/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
similarity index 81%
rename from tests/module/src/com/android/customization/TestModule.kt
rename to tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
index c39d3e3..687ec9b 100644
--- a/tests/module/src/com/android/customization/TestModule.kt
+++ b/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
@@ -1,4 +1,19 @@
-package com.android.customization
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.wallpaper
import androidx.test.core.app.ApplicationProvider
import com.android.customization.model.color.ColorCustomizationManager
@@ -9,12 +24,12 @@
import com.android.customization.module.logging.ThemesUserEventLogger
import com.android.customization.testing.TestCustomizationInjector
import com.android.customization.testing.TestDefaultCustomizationPreferences
-import com.android.wallpaper.module.AppModule
import com.android.wallpaper.module.Injector
import com.android.wallpaper.module.PartnerProvider
import com.android.wallpaper.module.WallpaperPreferences
import com.android.wallpaper.module.logging.TestUserEventLogger
import com.android.wallpaper.module.logging.UserEventLogger
+import com.android.wallpaper.modules.ThemePickerAppModule
import com.android.wallpaper.picker.preview.data.util.DefaultLiveWallpaperDownloader
import com.android.wallpaper.picker.preview.data.util.LiveWallpaperDownloader
import com.android.wallpaper.testing.TestInjector
@@ -30,8 +45,8 @@
import javax.inject.Singleton
@Module
-@TestInstallIn(components = [SingletonComponent::class], replaces = [AppModule::class])
-abstract class TestModule {
+@TestInstallIn(components = [SingletonComponent::class], replaces = [ThemePickerAppModule::class])
+abstract class ThemePickerTestModule {
//// WallpaperPicker2 prod
@Binds @Singleton abstract fun bindInjector(impl: TestCustomizationInjector): Injector