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

Rename “Mobile data usage” to “App data usage” & hide summary

Browse Source 
In Data usage screen, rename “Mobile data usage” to “App data usage” &
hide summary.

Also, change the title of the new "App data usage" (old "Mobile data
usage") screen to "App data usage".

Test: manual
Test: make RunSettingsRoboTests
Bug: 70950124
Change-Id: Ide9bcb2a4b171edcd088d68275bacda1eb449afe
This commit is contained in:
Andreas Terzis
2018-03-08 22:51:47 -08:00
parent 2dd0a66c81
commit b8642b79c3
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -8652,6 +8652,9 @@
<!-- Label for cellular data usage in data usage screen [CHAR LIMIT=60] --> <!-- Label for cellular data usage in data usage screen [CHAR LIMIT=60] -->
<string name="cellular_data_usage">Mobile data usage</string> <string name="cellular_data_usage">Mobile data usage</string>
<!-- App data usage, as seen from the platform, in data usage screen [CHAR LIMIT=60] -->
<string name="app_cellular_data_usage">App data usage</string>
<!-- Label for wifi data usage in data usage screen [CHAR LIMIT=60] --> <!-- Label for wifi data usage in data usage screen [CHAR LIMIT=60] -->
<string name="wifi_data_usage">Wi-Fi data usage</string> <string name="wifi_data_usage">Wi-Fi data usage</string>

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

@@ -23,9 +23,11 @@ import android.support.v4.content.res.TypedArrayUtils;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.text.format.Formatter; import android.text.format.Formatter;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.FeatureFlagUtils;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.net.DataUsageController; import com.android.settingslib.net.DataUsageController;
@@ -53,8 +55,13 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
mSubId = subId; mSubId = subId;
DataUsageController controller = new DataUsageController(getContext()); DataUsageController controller = new DataUsageController(getContext());
DataUsageController.DataUsageInfo usageInfo = controller.getDataUsageInfo(mTemplate); DataUsageController.DataUsageInfo usageInfo = controller.getDataUsageInfo(mTemplate);
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) {
setTitle(getContext().getString(R.string.app_cellular_data_usage));
} else {
setTitle(getContext().getString(R.string.cellular_data_usage));
setSummary(getContext().getString(R.string.data_usage_template, setSummary(getContext().getString(R.string.data_usage_template,
Formatter.formatFileSize(getContext(), usageInfo.usageLevel), usageInfo.period)); Formatter.formatFileSize(getContext(), usageInfo.usageLevel), usageInfo.period));
}
setIntent(getIntent()); setIntent(getIntent());
} }
@@ -67,11 +74,15 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
.setArguments(args) .setArguments(args)
.setDestination(DataUsageList.class.getName()) .setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN); .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) {
launcher.setTitle(getContext().getString(R.string.app_cellular_data_usage));
} else {
if (mTitleRes > 0) { if (mTitleRes > 0) {
launcher.setTitle(mTitleRes); launcher.setTitle(mTitleRes);
} else { } else {
launcher.setTitle(getTitle()); launcher.setTitle(getTitle());
} }
}
return launcher.toIntent(); return launcher.toIntent();
} }
} }