Merge "[SB Refactor] Add table logging to the wifi view model." into tm-qpr-dev (49480248) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/WifiUiAdapter.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import com.android.systemui.lifecycle.repeatWhenAttached
		import com.android.systemui.statusbar.phone.StatusBarIconController
		import com.android.systemui.statusbar.phone.StatusBarLocation
		import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags
		import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
		import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel
		import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.WifiViewModel
		import javax.inject.Inject
		@@ -73,7 +74,9 @@ constructor(
		// Note that this flow may still run if
		// [statusBarPipelineFlags.runNewWifiIconBackend] is true because we may
		// want to get the logging data without rendering.
		if (wifiIcon != null && statusBarPipelineFlags.useNewWifiIcon()) {
		if (
		wifiIcon is WifiIcon.Visible && statusBarPipelineFlags.useNewWifiIcon()
		) {
		iconController.setNewWifiIcon()
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt

+6 −3

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import com.android.systemui.statusbar.StatusBarIconView
		import com.android.systemui.statusbar.StatusBarIconView.STATE_DOT
		import com.android.systemui.statusbar.StatusBarIconView.STATE_HIDDEN
		import com.android.systemui.statusbar.StatusBarIconView.STATE_ICON
		import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
		import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel
		import kotlinx.coroutines.InternalCoroutinesApi
		import kotlinx.coroutines.flow.MutableStateFlow
		@@ -92,8 +93,10 @@ object WifiViewBinder {

		launch {
		viewModel.wifiIcon.collect { wifiIcon ->
		view.isVisible = wifiIcon != null
		wifiIcon?.let { IconViewBinder.bind(wifiIcon, iconView) }
		view.isVisible = wifiIcon is WifiIcon.Visible
		if (wifiIcon is WifiIcon.Visible) {
		IconViewBinder.bind(wifiIcon.icon, iconView)
		}
		}
		}

		@@ -135,7 +138,7 @@ object WifiViewBinder {

		return object : Binding {
		override fun getShouldIconBeVisible(): Boolean {
		return viewModel.wifiIcon.value != null
		return viewModel.wifiIcon.value is WifiIcon.Visible
		}

		override fun onVisibilityStateChanged(@StatusBarIconView.VisibleState state: Int) {

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/WifiIcon.kt

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.statusbar.pipeline.wifi.ui.model

		import android.annotation.DrawableRes
		import com.android.systemui.common.shared.model.ContentDescription
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.log.table.Diffable
		import com.android.systemui.log.table.TableRowLogger

		/** Represents the various states of the wifi icon. */
		sealed interface WifiIcon : Diffable<WifiIcon> {
		/** Represents a wifi icon that should be hidden (not visible). */
		object Hidden : WifiIcon {
		override fun toString() = "hidden"
		}

		/**
		* Represents a visible wifi icon that uses [res] as its image and [contentDescription] as its
		* description.
		*/
		class Visible(
		@DrawableRes res: Int,
		val contentDescription: ContentDescription.Loaded,
		) : WifiIcon {
		val icon = Icon.Resource(res, contentDescription)

		override fun toString() = contentDescription.description.toString()
		}

		override fun logDiffs(prevVal: WifiIcon, row: TableRowLogger) {
		if (prevVal.toString() != toString()) {
		row.logChange(COL_ICON, toString())
		}
		}

		override fun logFull(row: TableRowLogger) {
		row.logChange(COL_ICON, toString())
		}
		}

		private const val COL_ICON = "wifiIcon"

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/HomeWifiViewModel.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		package com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel

		import android.graphics.Color
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags
		import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.StateFlow

		@@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.StateFlow
		*/
		class HomeWifiViewModel(
		statusBarPipelineFlags: StatusBarPipelineFlags,
		wifiIcon: StateFlow<Icon.Resource?>,
		wifiIcon: StateFlow<WifiIcon>,
		isActivityInViewVisible: Flow<Boolean>,
		isActivityOutViewVisible: Flow<Boolean>,
		isActivityContainerVisible: Flow<Boolean>,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/KeyguardWifiViewModel.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,15 +17,15 @@
		package com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel

		import android.graphics.Color
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags
		import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.StateFlow

		/** A view model for the wifi icon shown on keyguard (lockscreen). */
		class KeyguardWifiViewModel(
		statusBarPipelineFlags: StatusBarPipelineFlags,
		wifiIcon: StateFlow<Icon.Resource?>,
		wifiIcon: StateFlow<WifiIcon>,
		isActivityInViewVisible: Flow<Boolean>,
		isActivityOutViewVisible: Flow<Boolean>,
		isActivityContainerVisible: Flow<Boolean>,