Merge "Allow multiple clock plugins simultaneously" into tm-qpr-dev
This commit is contained in:
@@ -105,7 +105,8 @@ open class ClockRegistry(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pluginManager.addPluginListener(pluginListener, ClockProviderPlugin::class.java)
|
pluginManager.addPluginListener(pluginListener, ClockProviderPlugin::class.java,
|
||||||
|
true /* allowMultiple */)
|
||||||
context.contentResolver.registerContentObserver(
|
context.contentResolver.registerContentObserver(
|
||||||
Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE),
|
Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE),
|
||||||
false,
|
false,
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ class ClockRegistryTest : SysuiTestCase() {
|
|||||||
registry.isEnabled = true
|
registry.isEnabled = true
|
||||||
|
|
||||||
verify(mockPluginManager)
|
verify(mockPluginManager)
|
||||||
.addPluginListener(captor.capture(), eq(ClockProviderPlugin::class.java))
|
.addPluginListener(captor.capture(), eq(ClockProviderPlugin::class.java), eq(true))
|
||||||
pluginListener = captor.value
|
pluginListener = captor.value
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user