Move ClockRegistry to SystemUISharedLib
Bug: 229771520
Test: Automated
Change-Id: I7e921038a803188eee4cc437b7076db97ecdd853
(cherry picked from commit 1323984dac09429d1d39150518065daf01c7d002)
Merged-In: I7e921038a803188eee4cc437b7076db97ecdd853
diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockProviderPlugin.kt
similarity index 95%
rename from packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt
rename to packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockProviderPlugin.kt
index 032f946..916a557 100644
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockProviderPlugin.kt
@@ -11,8 +11,9 @@
* KIND, either express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package com.android.systemui.plugins
+package com.android.systemui.shared.clocks
+import com.android.systemui.plugins.Plugin
import com.android.systemui.plugins.annotations.ProvidesInterface
import android.annotation.FloatRange
import android.graphics.drawable.Drawable
diff --git a/packages/SystemUI/src/com/android/keyguard/clock/ClockRegistry.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt
similarity index 89%
rename from packages/SystemUI/src/com/android/keyguard/clock/ClockRegistry.kt
rename to packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt
index c168a46..209b576 100644
--- a/packages/SystemUI/src/com/android/keyguard/clock/ClockRegistry.kt
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt
@@ -11,17 +11,11 @@
* KIND, either express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package com.android.keyguard.clock
+package com.android.systemui.shared.clocks
import android.content.Context
import android.graphics.drawable.Drawable
import android.util.Log
-import com.android.systemui.dagger.SysUISingleton
-import com.android.systemui.plugins.Clock
-import com.android.systemui.plugins.ClockId
-import com.android.systemui.plugins.ClockMetadata
-import com.android.systemui.plugins.ClockProvider
-import com.android.systemui.plugins.ClockProviderPlugin
import com.android.systemui.plugins.PluginListener
import com.android.systemui.shared.plugins.PluginManager
import javax.inject.Inject
@@ -32,8 +26,6 @@
typealias ClockChangeListener = () -> Unit
/** ClockRegistry aggregates providers and plugins */
-// TODO: Is this the right place for this?
-@SysUISingleton
class ClockRegistry @Inject constructor(
val context: Context,
val pluginManager: PluginManager
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/clock/ClockRegistryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
similarity index 95%
rename from packages/SystemUI/tests/src/com/android/keyguard/clock/ClockRegistryTest.kt
rename to packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
index dc28e4d..5d3c575 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/clock/ClockRegistryTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
@@ -13,18 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-
-package com.android.keyguard.clock
+package com.android.systemui.shared.clocks
import android.content.Context
import android.graphics.drawable.Drawable
import android.testing.AndroidTestingRunner
import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase
-import com.android.systemui.plugins.Clock
-import com.android.systemui.plugins.ClockId
-import com.android.systemui.plugins.ClockMetadata
-import com.android.systemui.plugins.ClockProviderPlugin
import com.android.systemui.plugins.PluginListener
import com.android.systemui.shared.plugins.PluginManager
import com.android.systemui.util.mockito.argumentCaptor