PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Move mobile data template out of framework

Browse Source 
Move mobile data template out of framework

Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageLibTest
Change-Id: I5072cd1e673194d00b3ce82242bf5fbad88d23cd
This commit is contained in:
Bonian Chen
2020-05-29 17:28:34 +08:00
parent 90331c0f20
commit d40f7f707e
7 changed files with 204 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
View File

@@ -39,6 +39,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.util.CollectionUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.datausage.lib.DataUsageLib;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.telephony.TelephonyBasePreferenceController;
import com.android.settings.widget.EntityHeaderController;
@@ -134,7 +135,7 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
if (subInfo != null) {
mDataUsageTemplate = R.string.cell_data_template;
mDefaultTemplate = DataUsageUtils.getMobileTemplate(context, subscriptionId);
mDefaultTemplate = DataUsageLib.getMobileTemplate(context, subscriptionId);
} else if (DataUsageUtils.hasWifiRadio(context)) {
mDataUsageTemplate = R.string.wifi_data_template;
mDefaultTemplate = NetworkTemplate.buildTemplateWifiWildcard();