Merge "Controls - Handle action responses" (84f74893) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt

+28 −1

Original line number	Diff line number	Diff line
		@@ -34,14 +34,17 @@ import android.widget.ImageView
		import android.widget.TextView

		import com.android.systemui.controls.controller.ControlsController
		import com.android.systemui.util.concurrency.DelayableExecutor
		import com.android.systemui.R

		const val MIN_LEVEL = 0
		const val MAX_LEVEL = 10000
		private const val UPDATE_DELAY_IN_MILLIS = 2000L

		class ControlViewHolder(
		val layout: ViewGroup,
		val controlsController: ControlsController
		val controlsController: ControlsController,
		val uiExecutor: DelayableExecutor
		) {
		val icon: ImageView = layout.requireViewById(R.id.icon)
		val status: TextView = layout.requireViewById(R.id.status)
		@@ -52,6 +55,7 @@ class ControlViewHolder(
		val clipLayer: ClipDrawable
		val gd: GradientDrawable
		lateinit var cws: ControlWithState
		var cancelUpdate: Runnable? = null

		init {
		val ld = layout.getBackground() as LayerDrawable
		@@ -63,6 +67,8 @@ class ControlViewHolder(
		fun bindData(cws: ControlWithState) {
		this.cws = cws

		cancelUpdate?.run()

		val (status, template) = cws.control?.let {
		title.setText(it.getTitle())
		subtitle.setText(it.getSubtitle())
		@@ -86,6 +92,27 @@ class ControlViewHolder(
		findBehavior(status, template).apply(this, cws)
		}

		fun actionResponse(@ControlAction.ResponseResult response: Int) {
		val text = when (response) {
		ControlAction.RESPONSE_OK -> "Success"
		ControlAction.RESPONSE_FAIL -> "Error"
		else -> ""
		}

		if (!text.isEmpty()) {
		val previousText = status.getText()
		val previousTextExtra = statusExtra.getText()

		cancelUpdate = uiExecutor.executeDelayed({
		status.setText(previousText)
		statusExtra.setText(previousTextExtra)
		}, UPDATE_DELAY_IN_MILLIS)

		status.setText(text)
		statusExtra.setText("")
		}
		}

		fun action(action: ControlAction) {
		controlsController.action(cws.ci, action)
		}

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt

+19 −13

Original line number	Diff line number	Diff line
		@@ -38,10 +38,10 @@ import com.android.systemui.controls.controller.ControlInfo
		import com.android.systemui.controls.management.ControlsProviderSelectorActivity
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.R
		import com.android.systemui.util.concurrency.DelayableExecutor

		import dagger.Lazy

		import java.util.concurrent.Executor
		import javax.inject.Inject
		import javax.inject.Singleton

		@@ -104,16 +104,18 @@ class TokenProviderConnection(val cc: ControlsController, val context: Context)
		}
		}

		private data class ControlKey(val componentName: ComponentName, val controlId: String)

		@Singleton
		class ControlsUiControllerImpl @Inject constructor (
		val controlsController: Lazy<ControlsController>,
		val context: Context,
		@Main val uiExecutor: Executor
		@Main val uiExecutor: DelayableExecutor
		) : ControlsUiController {

		private lateinit var controlInfos: List<ControlInfo>
		private val controlsById = mutableMapOf<Pair<ComponentName, String>, ControlWithState>()
		private val controlViewsById = mutableMapOf<String, ControlViewHolder>()
		private val controlsById = mutableMapOf<ControlKey, ControlWithState>()
		private val controlViewsById = mutableMapOf<ControlKey, ControlViewHolder>()
		private lateinit var parent: ViewGroup

		override fun show(parent: ViewGroup) {
		@@ -125,7 +127,7 @@ class ControlsUiControllerImpl @Inject constructor (

		controlInfos.map {
		ControlWithState(it, null)
		}.associateByTo(controlsById) { Pair(it.ci.component, it.ci.controlId) }
		}.associateByTo(controlsById) { ControlKey(it.ci.component, it.ci.controlId) }

		if (controlInfos.isEmpty()) {
		showInitialSetupView()
		@@ -178,9 +180,10 @@ class ControlsUiControllerImpl @Inject constructor (
		val item = inflater.inflate(
		R.layout.controls_base_item, lastRow, false) as ViewGroup
		lastRow.addView(item)
		val cvh = ControlViewHolder(item, controlsController.get())
		cvh.bindData(controlsById.get(Pair(it.component, it.controlId))!!)
		controlViewsById.put(it.controlId, cvh)
		val cvh = ControlViewHolder(item, controlsController.get(), uiExecutor)
		val key = ControlKey(it.component, it.controlId)
		cvh.bindData(controlsById.getValue(key))
		controlViewsById.put(key, cvh)
		}

		if ((controlInfos.size % 2) == 1) {
		@@ -205,21 +208,24 @@ class ControlsUiControllerImpl @Inject constructor (
		override fun onRefreshState(componentName: ComponentName, controls: List<Control>) {
		Log.d(TAG, "onRefreshState()")
		controls.forEach { c ->
		controlsById.get(Pair(componentName, c.getControlId()))?.let {
		controlsById.get(ControlKey(componentName, c.getControlId()))?.let {
		Log.d(TAG, "onRefreshState() for id: " + c.getControlId())
		val cws = ControlWithState(it.ci, c)
		controlsById.put(Pair(componentName, c.getControlId()), cws)
		val key = ControlKey(componentName, c.getControlId())
		controlsById.put(key, cws)

		uiExecutor.execute {
		controlViewsById.get(c.getControlId())?.bindData(cws)
		controlViewsById.get(key)?.bindData(cws)
		}
		}
		}
		}

		override fun onActionResponse(componentName: ComponentName, controlId: String, response: Int) {
		Log.d(TAG, "onActionResponse()")
		TODO("not implemented")
		val key = ControlKey(componentName, controlId)
		uiExecutor.execute {
		controlViewsById.get(key)?.actionResponse(response)
		}
		}

		private fun createRow(inflater: LayoutInflater, parent: ViewGroup): ViewGroup {