Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8642b79 authored by Andreas Terzis's avatar Andreas Terzis
Browse files

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

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
parent 2dd0a66c

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -8652,6 +8652,9 @@ 
    <!-- Label for cellular data usage in data usage screen [CHAR LIMIT=60] -->

    <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] -->









    <string name="wifi_data_usage">Wi-Fi data usage</string>

































src/com/android/settings/datausage/DataUsagePreference.java



+15
−4






























Original line number
Diff line number
Diff line







@@ -23,9 +23,11 @@ import android.support.v4.content.res.TypedArrayUtils;







import android.support.v7.preference.Preference;









import android.text.format.Formatter;









import android.util.AttributeSet;









import android.util.FeatureFlagUtils;



















import com.android.internal.logging.nano.MetricsProto;









import com.android.settings.R;









import com.android.settings.core.FeatureFlags;









import com.android.settings.core.SubSettingLauncher;









import com.android.settingslib.net.DataUsageController;


















@@ -53,8 +55,13 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc







        mSubId = subId;









        DataUsageController controller = new DataUsageController(getContext());









        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,









                  Formatter.formatFileSize(getContext(), usageInfo.usageLevel), usageInfo.period));









        }









        setIntent(getIntent());









    }


















@@ -67,11 +74,15 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc







                .setArguments(args)









                .setDestination(DataUsageList.class.getName())









                .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) {









            launcher.setTitle(mTitleRes);









          } else {









            launcher.setTitle(getTitle());









          }









        }









        return launcher.toIntent();









    }









}