[bugfix] fixing InternetTileNewImpl secondary click

Change-Id: Ib9420f5fb7dd0f249c6703a60b151b78fd6a5c24
Signed-off-by: rmp22 <195054967+rmp22@users.noreply.github.com>

Author: rmp22

packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt

@@ -21,6 +21,7 @@ import android.os.Handler
 import android.os.Looper
 import android.provider.Settings
 import android.widget.Button
+import com.android.settingslib.net.DataUsageController
 import com.android.internal.logging.MetricsLogger
 import com.android.systemui.animation.Expandable
 import com.android.systemui.dagger.qualifiers.Background
@@ -36,8 +37,11 @@ import com.android.systemui.qs.logging.QSLogger
 import com.android.systemui.qs.tileimpl.QSTileImpl
 import com.android.systemui.qs.tiles.dialog.InternetDetailsViewModel
 import com.android.systemui.qs.tiles.dialog.InternetDialogManager
+import com.android.systemui.qs.tiles.dialog.WifiStateWorker
 import com.android.systemui.res.R
+import com.android.systemui.Prefs
 import com.android.systemui.statusbar.connectivity.AccessPointController
+import com.android.systemui.statusbar.connectivity.NetworkController
 import com.android.systemui.statusbar.pipeline.shared.ui.binder.InternetTileBinder
 import com.android.systemui.statusbar.pipeline.shared.ui.model.InternetTileModel
 import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.InternetTileViewModel
@@ -59,6 +63,8 @@ constructor(
     private val internetDialogManager: InternetDialogManager,
     private val accessPointController: AccessPointController,
     private val internetDetailsViewModelFactory: InternetDetailsViewModel.Factory,
+    private val wifiStateWorker: WifiStateWorker,
+    private val networkController: NetworkController
 ) :
     QSTileImpl<QSTile.BooleanState>(
         host,
@@ -72,6 +78,25 @@ constructor(
         qsLogger,
     ) {
     private var model: InternetTileModel = viewModel.tileModel.value
+    private val dataUsageController: DataUsageController = networkController.mobileDataController
+    
+    private var dataEnabled: Boolean
+        get() = dataUsageController.isMobileDataEnabled()
+        set(value) {
+            dataUsageController.setMobileDataEnabled(value)
+        }
+
+    private var wifiEnabled: Boolean
+        get() = wifiStateWorker.isWifiEnabled()
+        set(value) {
+            wifiStateWorker.setWifiEnabled(value)
+        }
+
+    private var lastUsedModel: Int
+        get() = Prefs.getInt(mContext, "internet_tile_model", WIFI)
+        set(value) {
+            Prefs.putInt(mContext, "internet_tile_model", value)
+        }
 
     init {
         InternetTileBinder.bind(lifecycle, viewModel.tileModel) { newModel ->
@@ -84,7 +109,10 @@ constructor(
         mContext.getString(R.string.quick_settings_internet_label)
 
     override fun newTileState(): QSTile.BooleanState {
-        return QSTile.BooleanState().also { it.forceExpandIcon = true }
+        return QSTile.BooleanState().also {
+             it.forceExpandIcon = true
+             it.handlesSecondaryClick = true
+        }
     }
 
     override fun handleClick(expandable: Expandable?) {
@@ -98,6 +126,26 @@ constructor(
         }
     }
 
+    override fun handleSecondaryClick(expandable: Expandable?) {
+        when {
+            wifiEnabled -> {
+                wifiEnabled = false
+                lastUsedModel = WIFI
+            }
+            dataEnabled -> {
+                dataEnabled = false
+                lastUsedModel = DATA
+            }
+            else -> {
+                if (lastUsedModel == WIFI) {
+                    wifiEnabled = true
+                } else {
+                    dataEnabled = true
+                }
+            }
+        }
+    }
+
     override fun getDetailsViewModel(): TileDetailsViewModel {
         return internetDetailsViewModelFactory.create()
     }
@@ -113,5 +161,7 @@ constructor(
 
     companion object {
         private val WIFI_SETTINGS = Intent(Settings.ACTION_WIFI_SETTINGS)
+        const val WIFI = 0
+        const val DATA = 1
     }
 }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt

@@ -41,9 +41,9 @@ sealed interface InternetTileModel {
     @SuppressLint("UseCompatLoadingForDrawables")
     fun applyTo(state: QSTile.BooleanState, context: Context) {
         if (secondaryLabel != null) {
-            state.secondaryLabel = secondaryLabel.loadText(context)
+            state.label = secondaryLabel.loadText(context)
         } else {
-            state.secondaryLabel = secondaryTitle
+            state.label = secondaryTitle
         }
 
         state.stateDescription = stateDescription.loadContentDescription(context)