Merge "New ViewModel implements Dumpable" into main (cc33c3fa) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImpl.kt

+10 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.qs.tiles.base.viewmodel

		import android.os.UserHandle
		import com.android.systemui.Dumpable
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.qs.tiles.base.analytics.QSTileAnalytics
		import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger
		@@ -34,6 +35,7 @@ import com.android.systemui.qs.tiles.viewmodel.QSTileViewModel
		import com.android.systemui.user.data.repository.UserRepository
		import com.android.systemui.util.kotlin.throttle
		import com.android.systemui.util.time.SystemClock
		import java.io.PrintWriter
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		@@ -81,7 +83,7 @@ class QSTileViewModelImpl<DATA_TYPE>(
		private val systemClock: SystemClock,
		private val backgroundDispatcher: CoroutineDispatcher,
		private val tileScope: CoroutineScope = CoroutineScope(SupervisorJob()),
		) : QSTileViewModel {
		) : QSTileViewModel, Dumpable {

		private val users: MutableStateFlow<UserHandle> =
		MutableStateFlow(userRepository.getSelectedUserInfo().userHandle)
		@@ -137,6 +139,13 @@ class QSTileViewModelImpl<DATA_TYPE>(
		tileScope.cancel()
		}

		override fun dump(pw: PrintWriter, args: Array<out String>) =
		with(pw) {
		println("${config.tileSpec.spec}:")
		print(" ")
		println(state.replayCache.lastOrNull().toString())
		}

		private fun createTileDataFlow(): SharedFlow<DATA_TYPE> =
		users
		.flatMapLatest { user ->

packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt

+7 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.util.Log
		import android.view.View
		import androidx.annotation.GuardedBy
		import com.android.internal.logging.InstanceId
		import com.android.systemui.Dumpable
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.plugins.qs.QSTile
		@@ -31,6 +32,7 @@ import com.android.systemui.qs.tileimpl.QSTileImpl.ResourceIcon
		import dagger.assisted.Assisted
		import dagger.assisted.AssistedFactory
		import dagger.assisted.AssistedInject
		import java.io.PrintWriter
		import java.util.function.Supplier
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.Job
		@@ -47,7 +49,7 @@ constructor(
		@Application private val applicationScope: CoroutineScope,
		private val qsHost: QSHost,
		@Assisted private val qsTileViewModel: QSTileViewModel,
		) : QSTile {
		) : QSTile, Dumpable {

		private val context
		get() = qsHost.context
		@@ -201,6 +203,10 @@ constructor(

		override fun getTileSpec(): String = qsTileViewModel.config.tileSpec.spec

		override fun dump(pw: PrintWriter, args: Array<out String>) =
		(qsTileViewModel as? Dumpable)?.dump(pw, args)
		?: pw.println("${getTileSpec()}: QSTileViewModel isn't dumpable")

		private companion object {

		const val DEBUG = false

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImplTest.kt

0 → 100644

+130 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.qs.tiles.base.viewmodel

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.classifier.FalsingManagerFake
		import com.android.systemui.common.shared.model.ContentDescription
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.qs.tiles.base.analytics.QSTileAnalytics
		import com.android.systemui.qs.tiles.base.interactor.FakeDisabledByPolicyInteractor
		import com.android.systemui.qs.tiles.base.interactor.FakeQSTileDataInteractor
		import com.android.systemui.qs.tiles.base.interactor.FakeQSTileUserActionInteractor
		import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper
		import com.android.systemui.qs.tiles.base.logging.QSTileLogger
		import com.android.systemui.qs.tiles.viewmodel.QSTileConfig
		import com.android.systemui.qs.tiles.viewmodel.QSTileConfigTestBuilder
		import com.android.systemui.qs.tiles.viewmodel.QSTilePolicy
		import com.android.systemui.qs.tiles.viewmodel.QSTileState
		import com.android.systemui.user.data.repository.FakeUserRepository
		import com.android.systemui.util.time.FakeSystemClock
		import com.google.common.truth.Truth.assertThat
		import java.io.PrintWriter
		import java.io.StringWriter
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.launchIn
		import kotlinx.coroutines.test.StandardTestDispatcher
		import kotlinx.coroutines.test.TestScope
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.junit.MockitoJUnit
		import org.mockito.junit.MockitoRule

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@OptIn(ExperimentalCoroutinesApi::class)
		class QSTileViewModelImplTest : SysuiTestCase() {

		@get:Rule val mockitoRule: MockitoRule = MockitoJUnit.rule()

		@Mock private lateinit var qsTileLogger: QSTileLogger
		@Mock private lateinit var qsTileAnalytics: QSTileAnalytics

		private val userRepository = FakeUserRepository()
		private val tileDataInteractor = FakeQSTileDataInteractor<Any>()
		private val tileUserActionInteractor = FakeQSTileUserActionInteractor<Any>()
		private val disabledByPolicyInteractor = FakeDisabledByPolicyInteractor()
		private val falsingManager = FalsingManagerFake()

		private val testCoroutineDispatcher = StandardTestDispatcher()
		private val testScope = TestScope(testCoroutineDispatcher)

		private lateinit var underTest: QSTileViewModelImpl<Any>

		@Before
		fun setup() {
		underTest =
		QSTileViewModelImpl(
		QSTileConfigTestBuilder.build {
		policy = QSTilePolicy.Restricted("test_restriction")
		},
		{ tileUserActionInteractor },
		{ tileDataInteractor },
		{
		object : QSTileDataToStateMapper<Any> {
		override fun map(config: QSTileConfig, data: Any): QSTileState =
		QSTileState.build(
		{ Icon.Resource(0, ContentDescription.Resource(0)) },
		data.toString()
		) {}
		}
		},
		disabledByPolicyInteractor,
		userRepository,
		falsingManager,
		qsTileAnalytics,
		qsTileLogger,
		FakeSystemClock(),
		testCoroutineDispatcher,
		testScope.backgroundScope,
		)
		}

		@Test
		fun dumpWritesState() =
		testScope.runTest {
		tileDataInteractor.emitData("test_data")
		underTest.state.launchIn(backgroundScope)
		runCurrent()

		val sw = StringWriter()
		PrintWriter(sw).use { underTest.dump(it, emptyArray()) }

		assertThat(sw.buffer.toString())
		.isEqualTo(
		"test_spec:\n" +
		" QSTileState(" +
		"icon=() -> com.android.systemui.common.shared.model.Icon, " +
		"label=test_data, " +
		"activationState=INACTIVE, " +
		"secondaryLabel=null, " +
		"supportedActions=[CLICK], " +
		"contentDescription=null, " +
		"stateDescription=null, " +
		"sideViewIcon=None, " +
		"enabledState=ENABLED, " +
		"expandedAccessibilityClassName=android.widget.Switch)\n"
		)
		}
		}