diff options
author | vincentpeng <vincentpeng@google.com> | 2018-03-28 10:46:17 +0800 |
---|---|---|
committer | vincentpeng <vincentpeng@google.com> | 2018-03-29 07:48:10 +0800 |
commit | 665b16bbfc1820344d16a6a6db009f932718626c (patch) | |
tree | 790af7ee2e7728b1f7ee5dae1f1782a4216c3b3d /src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java | |
parent | e0088452877b9f817b8c18c159149b4026d72321 (diff) |
Change DataUsageSummaryPreference.setLimitInfo(String text) to take CharSequence
"CharSequence is more correct" than String.
Change method to take in CharSequence parameter and modify callers/tests.
Bug: b/74960034
Test: RunSettingsRoboTests:DataUsageSummaryPreferenceTest and RunSettingsRoboTests:DataUsageSummaryPreferenceControllerTest
Change-Id: Ic83bde57bafff8416c0bd86b1ff2beb44ea12d0e
Diffstat (limited to 'src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java')
-rw-r--r-- | src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index dea71fe5d9..55e7392966 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -203,15 +203,15 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll summaryPreference.setLimitInfo(TextUtils.expandTemplate( mContext.getText(R.string.cell_data_warning_and_limit), Formatter.formatFileSize(mContext, info.warningLevel), - Formatter.formatFileSize(mContext, info.limitLevel)).toString()); + Formatter.formatFileSize(mContext, info.limitLevel))); } else if (info.warningLevel > 0) { summaryPreference.setLimitInfo(TextUtils.expandTemplate( mContext.getText(R.string.cell_data_warning), - Formatter.formatFileSize(mContext, info.warningLevel)).toString()); + Formatter.formatFileSize(mContext, info.warningLevel))); } else if (info.limitLevel > 0) { summaryPreference.setLimitInfo(TextUtils.expandTemplate( mContext.getText(R.string.cell_data_limit), - Formatter.formatFileSize(mContext, info.limitLevel)).toString()); + Formatter.formatFileSize(mContext, info.limitLevel))); } else { summaryPreference.setLimitInfo(null); } |