Move the logging files to the right package (1/2)
Test: Build success
Bug: 299659307
Change-Id: I27357d5fdfa0a1589a9fe411217e0e9469b863a6
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index d488ee4..0961886 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -25,8 +25,8 @@
defaults: ["ThemePicker_common_defaults"],
srcs: [
- "src/com/android/customization/testing/**/*.java",
- "src/com/android/customization/testing/**/*.kt",
+ "src/**/*.java",
+ "src/**/*.kt",
],
static_libs: [
"WallpaperPicker2TestLib",
diff --git a/tests/common/src/com/android/customization/testing/TestThemesUserEventLogger.kt b/tests/common/src/com/android/customization/module/logging/TestThemesUserEventLogger.kt
similarity index 89%
rename from tests/common/src/com/android/customization/testing/TestThemesUserEventLogger.kt
rename to tests/common/src/com/android/customization/module/logging/TestThemesUserEventLogger.kt
index 8b14688..b2835f4 100644
--- a/tests/common/src/com/android/customization/testing/TestThemesUserEventLogger.kt
+++ b/tests/common/src/com/android/customization/module/logging/TestThemesUserEventLogger.kt
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.customization.testing
+package com.android.customization.module.logging
import com.android.customization.model.color.ColorOption
import com.android.customization.model.grid.GridOption
-import com.android.customization.module.logging.ThemesUserEventLogger
-import com.android.wallpaper.testing.TestUserEventLogger
+import com.android.wallpaper.module.logging.TestUserEventLogger
/** Test implementation of [ThemesUserEventLogger]. */
class TestThemesUserEventLogger : TestUserEventLogger(), ThemesUserEventLogger {
diff --git a/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt b/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
index 0331f8d..678fb90 100644
--- a/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
+++ b/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
@@ -5,6 +5,7 @@
import androidx.activity.ComponentActivity
import com.android.customization.module.CustomizationInjector
import com.android.customization.module.CustomizationPreferences
+import com.android.customization.module.logging.TestThemesUserEventLogger
import com.android.customization.module.logging.ThemesUserEventLogger
import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor
import com.android.customization.picker.clock.ui.view.ClockViewFactory