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

Commit a4d78e43 authored by Shawn Ding's avatar Shawn Ding
Browse files

Fix data usage under Wi-Fi has title "Mobile data usage" 

Fix "Wi-Fi data usage" in Wi-Fi section. (Settings -> Network & internet -> Data usage)

Change-Id: I6c4117db321af252a2c3061f554ffbe2f87a714e
Fixes: 76165354
Test: Manual test
parent d6e81ab5

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

+22 −10
Original line number Original line Diff line number Diff line
@@ -56,11 +56,19 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc 
        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)) {

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) {

            if (mTemplate.isMatchRuleMobile()) {

                setTitle(getContext().getString(R.string.app_cellular_data_usage));

                setTitle(getContext().getString(R.string.app_cellular_data_usage));

            } else {

            } else {

          setTitle(getContext().getString(R.string.cellular_data_usage));

                setTitle(mTitleRes);

                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));

            }

        } else {

            setTitle(mTitleRes);

            setSummary(getContext().getString(R.string.data_usage_template,

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

                            usageInfo.period));

        }

        }

        setIntent(getIntent());

        setIntent(getIntent());

    }

    }
@@ -75,7 +83,11 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc 
                .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)) {

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) {

            if (mTemplate.isMatchRuleMobile()) {

                launcher.setTitle(getContext().getString(R.string.app_cellular_data_usage));

                launcher.setTitle(getContext().getString(R.string.app_cellular_data_usage));

            } else {

                launcher.setTitle(mTitleRes);

            }

        } else {

        } else {

            if (mTitleRes > 0) {

            if (mTitleRes > 0) {

                launcher.setTitle(mTitleRes);

                launcher.setTitle(mTitleRes);