Remove the deprecated class DataUsageBase.

- and update all its subclass to extend DataUsageBaseFragment instead.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: Ic5720af43082d8b39642b6a539515f3f20d32694
This commit is contained in:
Doris Ling
2018-08-30 14:16:13 -07:00
parent 3029efc5f7
commit 22c078c8de
5 changed files with 42 additions and 104 deletions

View File

@@ -52,7 +52,7 @@ import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class BillingCycleSettings extends DataUsageBase implements
public class BillingCycleSettings extends DataUsageBaseFragment implements
Preference.OnPreferenceChangeListener, DataUsageEditController {
private static final String TAG = "BillingCycleSettings";
@@ -105,7 +105,6 @@ public class BillingCycleSettings extends DataUsageBase implements
Bundle args = getArguments();
mNetworkTemplate = args.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE);
addPreferencesFromResource(R.xml.billing_cycle);
mBillingCycle = findPreference(KEY_BILLING_CYCLE);
mEnableDataWarning = (SwitchPreference) findPreference(KEY_SET_DATA_WARNING);
mEnableDataWarning.setOnPreferenceChangeListener(this);
@@ -191,6 +190,16 @@ public class BillingCycleSettings extends DataUsageBase implements
return MetricsEvent.BILLING_CYCLE;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.billing_cycle;
}
@Override
protected String getLogTag() {
return TAG;
}
@VisibleForTesting
void setPolicyLimitBytes(long limitBytes) {
if (LOGD) Log.d(TAG, "setPolicyLimitBytes()");