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

Merge \\\"Fix data usage format strings\\\" into nyc-dev am: cb1972b908 am: 2c7e1d844f

Browse Source 
am: 9667149282

Change-Id: I2dd2cc37911a466fd92811c37e334d6ef106f440
This commit is contained in:
Jason Monk
2016-06-08 19:30:49 +00:00
committed by android-build-merger
parent 5ff4935041 9667149282
commit bc75397385
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import android.support.v7.preference.PreferenceScreen;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.view.Menu;
import android.view.MenuInflater;
@@ -189,8 +190,8 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
if (mSummaryPreference != null) {
Formatter.BytesResult usedResult = Formatter.formatBytes(context.getResources(),
info.usageLevel, Formatter.FLAG_SHORTER);
mSummaryPreference.setAmount(usedResult.value);
mSummaryPreference.setUnits(getString(mDataUsageTemplate, usedResult.units));
mSummaryPreference.setTitle(TextUtils.expandTemplate(getText(mDataUsageTemplate),
usedResult.value, usedResult.units));
long limit = info.limitLevel;
if (limit <= 0) {
limit = info.warningLevel;