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

"Data Warn & Limits" pref. summary should be empty.

Browse Source 
The "Data Warning & Limits" preference in the Data Usage screen
should not have a summary.

Bug: 77300376

Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ic567e7451ac3ea102577ab96ccef3ce7de05d4ad
This commit is contained in:
Andreas Terzis
2018-03-29 23:19:10 -07:00
committed by Jan Nordqvist
parent 220a6a002e
commit 903a92535a
3 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/datausage/BillingCyclePreference.java
View File

@@ -23,9 +23,12 @@ import android.os.Bundle;
import android.os.RemoteException;
import android.support.v7.preference.Preference;
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.settings.datausage.CellDataPreference.DataStateListener;
@@ -58,7 +61,9 @@ public class BillingCyclePreference extends Preference implements TemplatePrefer
mSubId = subId;
mServices = services;
final int cycleDay = services.mPolicyEditor.getPolicyCycleDay(mTemplate);
if (cycleDay != CYCLE_NONE) {
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) {
setSummary(null);
} else if (cycleDay != CYCLE_NONE) {
setSummary(getContext().getString(R.string.billing_cycle_fragment_summary, cycleDay));
} else {
setSummary(null);