From 44fa7428e789939b7da1d2b21adb75965af7c8d3 Mon Sep 17 00:00:00 2001
From: Hawkwood Glazier <jglazier@google.com>
Date: Tue, 7 Jun 2022 17:28:09 +0000
Subject: [PATCH] Move plugin definition to plugin library

Bug: 229771520
Test: No new tests, just a package change
Change-Id: I591c337f8f6062befdb2a08f61a1456c5af04be3
(cherry picked from commit 14f67f4d7445ea39cbe99a285ed888cedfc17e21)
Merged-In: I591c337f8f6062befdb2a08f61a1456c5af04be3
---
 .../src/com/android/systemui/plugins}/ClockProviderPlugin.kt | 3 +--
 packages/SystemUI/shared/Android.bp                          | 1 +
 .../src/com/android/systemui/shared/clocks/ClockRegistry.kt  | 5 +++++
 .../com/android/systemui/shared/clocks/ClockRegistryTest.kt  | 4 ++++
 4 files changed, 11 insertions(+), 2 deletions(-)
 rename packages/SystemUI/{shared/src/com/android/systemui/shared/clocks => plugin/src/com/android/systemui/plugins}/ClockProviderPlugin.kt (97%)

diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockProviderPlugin.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt
similarity index 97%
rename from packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockProviderPlugin.kt
rename to packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt
index dba0c6dc9cae4..0c1916074e0c5 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockProviderPlugin.kt
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt
@@ -11,12 +11,11 @@
  * KIND, either express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.android.systemui.shared.clocks
+package com.android.systemui.plugins
 
 import android.graphics.drawable.Drawable
 import android.view.View
 import com.android.internal.colorextraction.ColorExtractor
-import com.android.systemui.plugins.Plugin
 import com.android.systemui.plugins.annotations.ProvidesInterface
 import java.io.PrintWriter
 import java.util.Locale
diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp
index 165f9eba6f4c7..81297169d610d 100644
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -48,6 +48,7 @@ android_library {
     static_libs: [
         "PluginCoreLib",
         "SystemUIAnimationLib",
+        "SystemUIPluginLib",
         "SystemUIUnfoldLib",
         "androidx.dynamicanimation_dynamicanimation",
         "androidx.concurrent_concurrent-futures",
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt
index 32459665e6cf5..2cac44a27e89d 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt
@@ -22,6 +22,11 @@ import android.os.UserHandle
 import android.provider.Settings
 import android.util.Log
 import com.android.systemui.dagger.qualifiers.Main
+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 com.google.gson.Gson
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
index aaa2357a1c520..9d82c249c635c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
@@ -25,6 +25,10 @@ import androidx.test.filters.SmallTest
 import com.android.systemui.SysuiTestCase
 import com.android.systemui.plugins.PluginListener
 import com.android.systemui.shared.plugins.PluginManager
+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.util.mockito.argumentCaptor
 import com.android.systemui.util.mockito.eq
 import junit.framework.Assert.assertEquals