Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45605364 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Move ClockRegistry to SystemUISharedLib" into tm-qpr-dev

parents e71aec0f b2f7ee84

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

+2 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −9
Original line number Diff line number Diff line
@@ -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

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

+1 −6
Original line number Diff line number Diff line
@@ -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