commit 0f7f1b598ae0786daa58812141ccb3a298f830dc
author Hawkwood Glazier <jglazier@google.com> Fri Nov 18 22:46:44 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 18 22:46:44 2022 +0000
tree 1f89b3c386c913670f437d2a8d4d711ae9ecd184
parent 682619dea3b2a3120b4b39b845bb25d61987bfab
parent f5a781de480a035c086b4a0e7b11f4b94303e5bf

Update PluginManager Import am: f5a781de48

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20519858

Change-Id: I8b0e762161d0d91e3687b8e8dfe86f7628a3f442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

robolectric_tests/src/com/android/customization/picker/clock/ClockCustomDemoFragmentTest.kt

diff --git a/robolectric_tests/src/com/android/customization/picker/clock/ClockCustomDemoFragmentTest.kt b/robolectric_tests/src/com/android/customization/picker/clock/ClockCustomDemoFragmentTest.kt
index 518b6a7..5f4c134 100644
--- a/robolectric_tests/src/com/android/customization/picker/clock/ClockCustomDemoFragmentTest.kt
+++ b/robolectric_tests/src/com/android/customization/picker/clock/ClockCustomDemoFragmentTest.kt
@@ -9,9 +9,9 @@
 import com.android.systemui.plugins.ClockId
 import com.android.systemui.plugins.ClockMetadata
 import com.android.systemui.plugins.ClockProviderPlugin
+import com.android.systemui.plugins.PluginManager
 import com.android.systemui.shared.clocks.ClockRegistry
 import com.android.systemui.shared.clocks.DefaultClockProvider
-import com.android.systemui.shared.plugins.PluginManager
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test

src/com/android/customization/picker/clock/ClockCustomDemoFragment.kt

diff --git a/src/com/android/customization/picker/clock/ClockCustomDemoFragment.kt b/src/com/android/customization/picker/clock/ClockCustomDemoFragment.kt
index f9c58ab..8648dca 100644
--- a/src/com/android/customization/picker/clock/ClockCustomDemoFragment.kt
+++ b/src/com/android/customization/picker/clock/ClockCustomDemoFragment.kt
@@ -22,13 +22,13 @@
 import com.android.systemui.plugins.ClockProviderPlugin
 import com.android.systemui.plugins.Plugin
 import com.android.systemui.plugins.PluginListener
+import com.android.systemui.plugins.PluginManager
 import com.android.systemui.shared.clocks.ClockRegistry
 import com.android.systemui.shared.clocks.DefaultClockProvider
 import com.android.systemui.shared.plugins.PluginActionManager
 import com.android.systemui.shared.plugins.PluginEnabler
 import com.android.systemui.shared.plugins.PluginEnabler.ENABLED
 import com.android.systemui.shared.plugins.PluginInstance
-import com.android.systemui.shared.plugins.PluginManager
 import com.android.systemui.shared.plugins.PluginManagerImpl
 import com.android.systemui.shared.plugins.PluginPrefs
 import com.android.systemui.shared.system.UncaughtExceptionPreHandlerManager_Factory