Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move ClockRegistry to SystemUISharedLib" into tm-qpr-dev am: 45605364c1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337176

Change-Id: I13fc5cde72f1057651d589b9d2a2862b8dad6713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hawkwood Glazier
2022-07-20 14:49:03 +00:00
committed by Automerger Merge Worker
parent 5a54cd9964 45605364c1
commit b6ea484fb6
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt → packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockProviderPlugin.kt
View File

@@ -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

10
packages/SystemUI/src/com/android/keyguard/clock/ClockRegistry.kt → packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt
View File

@@ -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 @@ private const val DEFAULT_CLOCK_ID = "DEFAULT"
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

7
packages/SystemUI/tests/src/com/android/keyguard/clock/ClockRegistryTest.kt → packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
View File

@@ -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