Remove the feature flag for using new title.
- remove all code that check for the feature flag, and use the new logic by default. Change-Id: I7fbe60da84c1c0f35e7241402a71d2bc4cd300e6 Fixes: 64564191 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -37,15 +37,13 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
|
||||
|
||||
public DataUsagePreference(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
if (InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {
|
||||
final TypedArray a = context.obtainStyledAttributes(
|
||||
attrs, new int[] { com.android.internal.R.attr.title },
|
||||
TypedArrayUtils.getAttr(
|
||||
context, android.support.v7.preference.R.attr.preferenceStyle,
|
||||
android.R.attr.preferenceStyle), 0);
|
||||
mTitleRes = a.getResourceId(0, 0);
|
||||
a.recycle();
|
||||
}
|
||||
final TypedArray a = context.obtainStyledAttributes(
|
||||
attrs, new int[] { com.android.internal.R.attr.title },
|
||||
TypedArrayUtils.getAttr(
|
||||
context, android.support.v7.preference.R.attr.preferenceStyle,
|
||||
android.R.attr.preferenceStyle), 0);
|
||||
mTitleRes = a.getResourceId(0, 0);
|
||||
a.recycle();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -59,9 +59,6 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
|
||||
public void onCreate(Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
setAnimationAllowed(true);
|
||||
if (!usePreferenceScreenTitle()) {
|
||||
addPreferencesFromResource(R.xml.unrestricted_data_access_settings);
|
||||
}
|
||||
mApplicationsState = ApplicationsState.getInstance(
|
||||
(Application) getContext().getApplicationContext());
|
||||
mDataSaverBackend = new DataSaverBackend(getContext());
|
||||
|
Reference in New Issue
Block a user