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

Merge "Fix typo in getHistoriclUsageLevel()"

Browse Source
This commit is contained in:
Doris Ling
2018-10-08 17:24:37 +00:00
committed by Android (Google) Code Review
parent 93c86ab1b6 d9663b7822
commit 77f7bf675c
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/DataUsagePreference.java
View File

@@ -51,8 +51,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
}
@Override
public void setTemplate(NetworkTemplate template, int subId,
NetworkServices services) {
public void setTemplate(NetworkTemplate template, int subId, NetworkServices services) {
mTemplate = template;
mSubId = subId;
final DataUsageController controller = getDataUsageController();
@@ -66,7 +65,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
DataUsageUtils.formatDataUsage(getContext(), usageInfo.usageLevel),
usageInfo.period));
}
final long usageLevel = controller.getHistoriclUsageLevel(template);
final long usageLevel = controller.getHistoricalUsageLevel(template);
if (usageLevel > 0L) {
setIntent(getIntent());
} else {

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

@@ -283,8 +283,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
formatUsedData()));
} else {
final DataUsageController.DataUsageInfo info =
mDataController
.getDataUsageInfo(NetworkTemplate.buildTemplateWifiWildcard());
mDataController.getWifiDataUsageInfo();
if (info == null) {
mSummaryLoader.setSummary(this, null);

6
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -178,7 +178,7 @@ public class DataUsageSummaryPreference extends Preference {
carrierInfo.setVisibility(View.GONE);
limitInfo.setVisibility(View.GONE);
final long usageLevel = getHistoriclUsageLevel();
final long usageLevel = getHistoricalUsageLevel();
if (usageLevel > 0L) {
launchButton.setOnClickListener((view) -> {
launchWifiDataUsage(getContext());
@@ -339,9 +339,9 @@ public class DataUsageSummaryPreference extends Preference {
}
@VisibleForTesting
long getHistoriclUsageLevel() {
long getHistoricalUsageLevel() {
final DataUsageController controller = new DataUsageController(getContext());
return controller.getHistoriclUsageLevel(NetworkTemplate.buildTemplateWifiWildcard());
return controller.getHistoricalUsageLevel(NetworkTemplate.buildTemplateWifiWildcard());
}
}