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

Merge "Change text for data warning and data limit." into pi-dev

Browse Source
This commit is contained in:
Sundeep Ghuman
2018-03-15 17:08:34 +00:00
committed by Android (Google) Code Review
parent e5c7317f3f 7b352d271e
commit b673aaadc9
3 changed files with 103 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ import android.util.RecurrenceRule;
import com.android.internal.util.CollectionUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.net.DataUsageController;
@@ -164,12 +165,19 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
refreshDataplanInfo(info);
}
if (mDataplanCount == 0 && (info.warningLevel > 0 || info.limitLevel > 0)) {
final String warning = Formatter.formatFileSize(mContext, info.warningLevel);
final String limit = Formatter.formatFileSize(mContext, info.limitLevel);
summaryPreference.setLimitInfo(mContext.getString(info.limitLevel <= 0
? R.string.cell_warning_only
: R.string.cell_warning_and_limit, warning, limit));
if (info.warningLevel > 0 && info.limitLevel > 0) {
summaryPreference.setLimitInfo(TextUtils.expandTemplate(
mContext.getText(R.string.cell_data_warning_and_limit),
Formatter.formatFileSize(mContext, info.warningLevel),
Formatter.formatFileSize(mContext, info.limitLevel)).toString());
} else if (info.warningLevel > 0) {
summaryPreference.setLimitInfo(TextUtils.expandTemplate(
mContext.getText(R.string.cell_data_warning),
Formatter.formatFileSize(mContext, info.warningLevel)).toString());
} else if (info.limitLevel > 0) {
summaryPreference.setLimitInfo(TextUtils.expandTemplate(
mContext.getText(R.string.cell_data_limit),
Formatter.formatFileSize(mContext, info.limitLevel)).toString());
} else {
summaryPreference.setLimitInfo(null);
}
@@ -188,6 +196,13 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
mDataplanCount, mManageSubscriptionIntent);
}
private String getLimitText(long limit, int textId) {
if (limit <= 0) {
return null;
}
return mContext.getString(textId, Formatter.formatFileSize(mContext, limit));
}
// TODO(b/70950124) add test for this method once the robolectric shadow run script is
// completed (b/3526807)
private void refreshDataplanInfo(DataUsageController.DataUsageInfo info) {