Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use DataUsageLib in DataUsagePreferenceController

Browse Source 
DataUsagePreferenceController use DataUsageLib before, and DataUsageLib
and com.android.settingslib.net.DataUsageUtils has same functionality.

com.android.settingslib.net.DataUsageUtils will be clean up, so use
DataUsageLib again.

Bug: 286082055
Test: m Settings
Change-Id: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
This commit is contained in:
Chaohui Wang
2023-07-04 19:08:46 +08:00
parent c4ffa7d504
commit 77fd6aa117
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datausage/DataUsageUtils.java
View File

@@ -46,7 +46,7 @@ import java.util.Optional;
/**
* Utility methods for data usage classes.
*/
public final class DataUsageUtils extends com.android.settingslib.net.DataUsageUtils {
public final class DataUsageUtils {
static final boolean TEST_RADIOS = false;
static final String TEST_RADIOS_PROP = "test.radios";
private static final boolean LOGD = false;

5
src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
View File

@@ -30,6 +30,7 @@ import androidx.preference.Preference
import androidx.preference.PreferenceScreen
import com.android.settings.R
import com.android.settings.datausage.DataUsageUtils
import com.android.settings.datausage.lib.DataUsageLib
import com.android.settingslib.net.DataUsageController
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -63,7 +64,7 @@ class DataUsagePreferenceController(context: Context, key: String) :
preference = screen.findPreference(preferenceKey)!!
}
fun whenViewCreated(viewLifecycleOwner: LifecycleOwner) {
override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
viewLifecycleOwner.lifecycleScope.launch {
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
update()
@@ -96,7 +97,7 @@ class DataUsagePreferenceController(context: Context, key: String) :
private fun getNetworkTemplate(): NetworkTemplate? = when {
SubscriptionManager.isValidSubscriptionId(mSubId) -> {
DataUsageUtils.getMobileTemplate(mContext, mSubId)
DataUsageLib.getMobileTemplate(mContext, mSubId)
}
else -> null

9
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -31,10 +31,7 @@ import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -330,12 +327,6 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
onRestoreInstance(icicle);
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
use(DataUsagePreferenceController.class).whenViewCreated(getViewLifecycleOwner());
}
@Override
public void onResume() {
super.onResume();