Move unrestricted data summary to DataSaverController
DataSaverController currently used in 2 pages, - Network & internet > Data Saver - Apps > Special app access This helps unify the logic, and instead of showing on "Special app access", this summary shows on "Unrestricted data" is make more sense. Bug: 280280596 Test: Manually on above pages Test: Unit test Change-Id: Ia151ed8179a250f8f20cc5041f9383fffebdab10
This commit is contained in:
@@ -17,34 +17,22 @@ package com.android.settings.datausage
|
||||
|
||||
import android.app.settings.SettingsEnums
|
||||
import android.content.Context
|
||||
import android.net.NetworkPolicyManager
|
||||
import android.os.Bundle
|
||||
import android.os.UserHandle
|
||||
import android.telephony.SubscriptionManager
|
||||
import android.view.View
|
||||
import android.widget.Switch
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.preference.Preference
|
||||
import com.android.settings.R
|
||||
import com.android.settings.SettingsActivity
|
||||
import com.android.settings.SettingsPreferenceFragment
|
||||
import com.android.settings.applications.specialaccess.DataSaverController
|
||||
import com.android.settings.dashboard.DashboardFragment
|
||||
import com.android.settings.search.BaseSearchIndexProvider
|
||||
import com.android.settings.widget.SettingsMainSwitchBar
|
||||
import com.android.settingslib.search.SearchIndexable
|
||||
import com.android.settingslib.spa.framework.util.formatString
|
||||
import com.android.settingslib.spaprivileged.model.app.AppListRepository
|
||||
import com.android.settingslib.spaprivileged.model.app.AppListRepositoryImpl
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.async
|
||||
import kotlinx.coroutines.coroutineScope
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@SearchIndexable
|
||||
class DataSaverSummary : SettingsPreferenceFragment() {
|
||||
class DataSaverSummary : DashboardFragment() {
|
||||
private lateinit var switchBar: SettingsMainSwitchBar
|
||||
private lateinit var dataSaverBackend: DataSaverBackend
|
||||
private lateinit var unrestrictedAccess: Preference
|
||||
|
||||
// Flag used to avoid infinite loop due if user switch it on/off too quick.
|
||||
private var switching = false
|
||||
@@ -57,8 +45,6 @@ class DataSaverSummary : SettingsPreferenceFragment() {
|
||||
return
|
||||
}
|
||||
|
||||
addPreferencesFromResource(R.xml.data_saver)
|
||||
unrestrictedAccess = findPreference(KEY_UNRESTRICTED_ACCESS)!!
|
||||
dataSaverBackend = DataSaverBackend(requireContext())
|
||||
}
|
||||
|
||||
@@ -73,12 +59,14 @@ class DataSaverSummary : SettingsPreferenceFragment() {
|
||||
}
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
use(DataSaverController::class.java).init(viewLifecycleOwner)
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
dataSaverBackend.addListener(dataSaverBackendListener)
|
||||
viewLifecycleOwner.lifecycleScope.launch {
|
||||
unrestrictedAccess.summary = getUnrestrictedSummary(requireContext())
|
||||
}
|
||||
}
|
||||
|
||||
override fun onPause() {
|
||||
@@ -95,9 +83,10 @@ class DataSaverSummary : SettingsPreferenceFragment() {
|
||||
}
|
||||
}
|
||||
|
||||
override fun getPreferenceScreenResId() = R.xml.data_saver
|
||||
override fun getMetricsCategory() = SettingsEnums.DATA_SAVER_SUMMARY
|
||||
|
||||
override fun getHelpResource() = R.string.help_url_data_saver
|
||||
override fun getLogTag() = TAG
|
||||
|
||||
private val dataSaverBackendListener = object : DataSaverBackend.Listener {
|
||||
override fun onDataSaverChanged(isDataSaving: Boolean) {
|
||||
@@ -109,32 +98,7 @@ class DataSaverSummary : SettingsPreferenceFragment() {
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val KEY_UNRESTRICTED_ACCESS = "unrestricted_access"
|
||||
|
||||
@VisibleForTesting
|
||||
suspend fun getUnrestrictedSummary(
|
||||
context: Context,
|
||||
appListRepository: AppListRepository =
|
||||
AppListRepositoryImpl(context.applicationContext),
|
||||
) = context.formatString(
|
||||
R.string.data_saver_unrestricted_summary,
|
||||
"count" to getAllowCount(context.applicationContext, appListRepository),
|
||||
)
|
||||
|
||||
private suspend fun getAllowCount(context: Context, appListRepository: AppListRepository) =
|
||||
withContext(Dispatchers.IO) {
|
||||
coroutineScope {
|
||||
val appsDeferred = async {
|
||||
appListRepository.loadAndFilterApps(
|
||||
userId = UserHandle.myUserId(),
|
||||
isSystemApp = false,
|
||||
)
|
||||
}
|
||||
val uidsAllowed = NetworkPolicyManager.from(context)
|
||||
.getUidsWithPolicy(NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND)
|
||||
appsDeferred.await().count { app -> app.uid in uidsAllowed }
|
||||
}
|
||||
}
|
||||
private const val TAG = "DataSaverSummary"
|
||||
|
||||
private fun Context.isDataSaverVisible(): Boolean =
|
||||
resources.getBoolean(R.bool.config_show_data_saver)
|
||||
|
Reference in New Issue
Block a user