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

src/com/android/settings/DeviceAdminSettings.java

@@ -49,7 +49,6 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 
@@ -137,9 +136,7 @@ public class DeviceAdminSettings extends ListFragment implements Instrumentable
         super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
         Utils.forceCustomPadding(getListView(), true /* additive padding */);
-        if (InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.manage_device_admin);
-            getActivity().setTitle(R.string.manage_device_admin);
-        }
     }
 
     @Override

src/com/android/settings/MasterClear.java

@@ -95,9 +95,7 @@ public class MasterClear extends InstrumentedPreferenceFragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.master_clear_title);
-            getActivity().setTitle(R.string.master_clear_title);
-        }
     }
 
     /**

src/com/android/settings/ResetNetwork.java

@@ -68,9 +68,7 @@ public class ResetNetwork extends InstrumentedPreferenceFragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.reset_network_title);
-            getActivity().setTitle(R.string.reset_network_title);
-        }
     }
 
     /**

src/com/android/settings/ScreenPinningSettings.java

@@ -65,9 +65,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
         super.onActivityCreated(savedInstanceState);
 
         final SettingsActivity activity = (SettingsActivity) getActivity();
-        if (usePreferenceScreenTitle()) {
+        activity.setTitle(R.string.screen_pinning_title);
-            activity.setTitle(R.string.screen_pinning_title);
-        }
         mLockPatternUtils = new LockPatternUtils(activity);
 
 

src/com/android/settings/SettingsActivity.java

@@ -209,12 +209,7 @@ public class SettingsActivity extends SettingsDrawerActivity
 
     @Override
     public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
-        if (InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {
+        startPreferencePanel(caller, pref.getFragment(), pref.getExtras(), -1, null, null, 0);
-            startPreferencePanel(caller, pref.getFragment(), pref.getExtras(), -1, null, null, 0);
-        } else {
-            startPreferencePanel(caller, pref.getFragment(), pref.getExtras(), -1, pref.getTitle(),
-                    null, 0);
-        }
         return true;
     }
 
@@ -631,13 +626,8 @@ public class SettingsActivity extends SettingsDrawerActivity
     public void startPreferencePanel(Fragment caller, String fragmentClass, Bundle args,
             int titleRes, CharSequence titleText, Fragment resultTo, int resultRequestCode) {
         String title = null;
-        if (titleRes < 0) {
+        if (titleRes < 0 && titleText != null) {
-            if (titleText != null) {
+            title = titleText.toString();
-                title = titleText.toString();
-            } else if (!InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {
-                // There not much we can do in that case
-                title = "";
-            }
         }
         Utils.startWithFragment(this, fragmentClass, args, resultTo, resultRequestCode,
                 titleRes, title, mIsShortcut, mMetricsFeatureProvider.getMetricsCategory(caller));

src/com/android/settings/TrustedCredentialsSettings.java

@@ -203,9 +203,7 @@ public class TrustedCredentialsSettings extends InstrumentedPreferenceFragment
         filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNLOCKED);
         activity.registerReceiver(mWorkProfileChangedReceiver, filter);
 
-        if (usePreferenceScreenTitle()) {
+        activity.setTitle(R.string.trusted_credentials);
-            activity.setTitle(R.string.trusted_credentials);
-        }
     }
 
     @Override

src/com/android/settings/UserCredentialsSettings.java

@@ -87,9 +87,7 @@ public class UserCredentialsSettings extends SettingsPreferenceFragment
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.user_credentials);
-            getActivity().setTitle(R.string.user_credentials);
-        }
     }
 
     protected void announceRemoval(String alias) {

src/com/android/settings/accessibility/AccessibilitySettings.java

@@ -521,9 +521,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
             extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
             extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
             extras.putString(EXTRA_TITLE, title);
-            if (usePreferenceScreenTitle()) {
+            extras.putParcelable(EXTRA_RESOLVE_INFO, resolveInfo);
-                extras.putParcelable(EXTRA_RESOLVE_INFO, resolveInfo);
-            }
 
             String description = info.loadDescription(getPackageManager());
             if (TextUtils.isEmpty(description)) {

src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java

@@ -59,9 +59,6 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!usePreferenceScreenTitle()) {
-            addPreferencesFromResource(R.xml.accessibility_shortcut_settings);
-        }
         mServicePreference = findPreference(SHORTCUT_SERVICE_KEY);
         mOnLockScreenSwitchPreference = (SwitchPreference) findPreference(ON_LOCK_SCREEN_KEY);
         mOnLockScreenSwitchPreference.setOnPreferenceChangeListener((Preference p, Object o) -> {

src/com/android/settings/accessibility/MagnificationPreferenceFragment.java

@@ -141,10 +141,8 @@ public final class MagnificationPreferenceFragment extends SettingsPreferenceFra
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED);
         extras.putString(AccessibilitySettings.EXTRA_TITLE, getString(
                 R.string.accessibility_screen_magnification_navbar_title));
-        if (usePreferenceScreenTitle()) {
+        extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,
-            extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,
+                R.string.accessibility_screen_magnification_navbar_title);
-                    R.string.accessibility_screen_magnification_navbar_title);
-        }
         extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY,
                 getActivity().getResources().getText(
                         R.string.accessibility_screen_magnification_navbar_summary));
@@ -194,10 +192,8 @@ public final class MagnificationPreferenceFragment extends SettingsPreferenceFra
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);
         extras.putString(AccessibilitySettings.EXTRA_TITLE, context.getString(
                 R.string.accessibility_screen_magnification_gestures_title));
-        if (usePreferenceScreenTitle()) {
+        extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,
-            extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,
+                R.string.accessibility_screen_magnification_gestures_title);
-                    R.string.accessibility_screen_magnification_gestures_title);
-        }
         extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY, context.getResources().getText(
                 R.string.accessibility_screen_magnification_summary));
         extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,

src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java

@@ -20,7 +20,6 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 
@@ -29,7 +28,6 @@ import com.android.settings.R;
 import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.widget.SwitchBar;
 
-
 /**
  * Fragment for preference screen for settings related to Automatically click after mouse stops
  * feature.
@@ -118,10 +116,6 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!usePreferenceScreenTitle()) {
-            addPreferencesFromResource(R.xml.accessibility_autoclick_settings);
-        }
-
         int delay = Settings.Secure.getInt(
                 getContentResolver(), Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
                 AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);
@@ -156,15 +150,6 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr
         onPreferenceToggled(Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, isChecked);
     }
 
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        if (!usePreferenceScreenTitle()) {
-            setTitle(getString(R.string.accessibility_autoclick_preference_title));
-        }
-    }
-
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mDelay && newValue instanceof Integer) {

src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java

@@ -20,7 +20,6 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 
@@ -50,10 +49,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!usePreferenceScreenTitle()) {
-            addPreferencesFromResource(R.xml.accessibility_daltonizer_settings);
-        }
-
         mType = (ListPreference) findPreference("type");
 
         if (!AccessibilitySettings.isColorTransformAccelerated(getActivity())) {
@@ -83,15 +78,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
         return true;
     }
 
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        if (!usePreferenceScreenTitle()) {
-            setTitle(getString(R.string.accessibility_display_daltonizer_preference_title));
-        }
-    }
-
     @Override
     protected void onInstallSwitchBarToggleSwitch() {
         super.onInstallSwitchBarToggleSwitch();

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

@@ -42,7 +42,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final int resId = getPreferenceScreenResId();
-        if (!usePreferenceScreenTitle() || resId <= 0) {
+        if (resId <= 0) {
             PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
                     getActivity());
             setPreferenceScreen(preferenceScreen);
@@ -119,8 +119,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
         }
 
         // Title.
-        if (usePreferenceScreenTitle()
+        if (arguments.containsKey(AccessibilitySettings.EXTRA_RESOLVE_INFO)) {
-                && arguments.containsKey(AccessibilitySettings.EXTRA_RESOLVE_INFO)) {
             ResolveInfo info = arguments.getParcelable(AccessibilitySettings.EXTRA_RESOLVE_INFO);
             getActivity().setTitle(info.loadLabel(getPackageManager()).toString());
         } else if (arguments.containsKey(AccessibilitySettings.EXTRA_TITLE)) {

src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java

@@ -52,9 +52,7 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
         for (int i = 0; i < strEntryValues.length; ++i) {
             mValues[i] = Float.parseFloat(strEntryValues[i]);
         }
-        if (usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.title_font_size);
-            getActivity().setTitle(R.string.title_font_size);
-        }
     }
 
     @Override

src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java

@@ -216,8 +216,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
             mInitialSetting = arguments.getBoolean(AccessibilitySettings.EXTRA_CHECKED);
         }
 
-        if (usePreferenceScreenTitle()
+        if (arguments.containsKey(AccessibilitySettings.EXTRA_TITLE_RES)) {
-                && arguments.containsKey(AccessibilitySettings.EXTRA_TITLE_RES)) {
             final int titleRes = arguments.getInt(AccessibilitySettings.EXTRA_TITLE_RES);
             if (titleRes > 0) {
                 getActivity().setTitle(titleRes);

src/com/android/settings/applications/ConvertToFbe.java

@@ -29,7 +29,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
 /* Class to prompt for conversion of userdata to file based encryption
@@ -49,9 +48,7 @@ public class ConvertToFbe extends InstrumentedFragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.convert_to_file_encryption);
-            getActivity().setTitle(R.string.convert_to_file_encryption);
-        }
     }
 
     @Override

src/com/android/settings/applications/ManageDomainUrls.java

@@ -65,9 +65,6 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setAnimationAllowed(true);
-        if (!usePreferenceScreenTitle()) {
-            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
-        }
         mApplicationsState = ApplicationsState.getInstance(
                 (Application) getContext().getApplicationContext());
         mSession = mApplicationsState.newSession(this, getLifecycle());

src/com/android/settings/applications/PictureInPictureSettings.java

@@ -148,9 +148,6 @@ public class PictureInPictureSettings extends EmptyTextSettings {
         mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
         mUserManager = new UserManagerWrapper(mContext.getSystemService(UserManager.class));
         mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
-        if (!usePreferenceScreenTitle()) {
-            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext));
-        }
     }
 
     @Override

src/com/android/settings/applications/PremiumSmsAccess.java

@@ -124,14 +124,8 @@ public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Cal
         if (apps == null) return;
         setEmptyText(R.string.premium_sms_none);
         setLoading(false, true);
-        final PreferenceScreen screen;
+        final PreferenceScreen screen = getPreferenceScreen();
-        if (usePreferenceScreenTitle()) {
+        screen.removeAll();
-            screen = getPreferenceScreen();
-            screen.removeAll();
-        } else {
-            screen = getPreferenceManager().createPreferenceScreen(getPrefContext());
-        }
-
         screen.setOrderingAsAdded(true);
 
         for (int i = 0; i < apps.size(); i++) {
@@ -145,10 +139,6 @@ public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Cal
             footer.setTitle(R.string.premium_sms_warning);
             screen.addPreference(footer);
         }
-
-        if (!usePreferenceScreenTitle()) {
-            setPreferenceScreen(screen);
-        }
     }
 
     private void update() {

src/com/android/settings/applications/RunningServices.java

@@ -44,9 +44,7 @@ public class RunningServices extends SettingsPreferenceFragment {
 
         setHasOptionsMenu(true);
 
-        if (usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.runningservices_settings_title);
-            getActivity().setTitle(R.string.runningservices_settings_title);
-        }
     }
 
     @Override

src/com/android/settings/applications/appops/BackgroundCheckSummary.java

@@ -40,9 +40,7 @@ public class BackgroundCheckSummary extends InstrumentedPreferenceFragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.background_check_pref);
-            getActivity().setTitle(R.string.background_check_pref);
-        }
     }
 
     @Override

src/com/android/settings/applications/manageapplications/ManageApplications.java

@@ -293,7 +293,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
 
         mResetAppsHelper = new ResetAppsHelper(activity);
 
-        if (usePreferenceScreenTitle() && screenTitle > 0) {
+        if (screenTitle > 0) {
             activity.setTitle(screenTitle);
         }
     }

src/com/android/settings/core/FeatureFlags.java

@@ -24,5 +24,4 @@ public class FeatureFlags {
     public static final String DEV_OPTION_V1 = "dev_option_v1";
     public static final String SEARCH_V2 = "settings_search_v2";
     public static final String SUGGESTIONS_V2 = "new_settings_suggestion";
-    public static final String USE_PREFERENCE_SCREEN_TITLE = "settings_use_preference_screen_title";
 }

src/com/android/settings/core/InstrumentedPreferenceFragment.java

@@ -68,11 +68,9 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        if (usePreferenceScreenTitle()) {
+        final int resId = getPreferenceScreenResId();
-            final int resId = getPreferenceScreenResId();
+        if (resId > 0) {
-            if (resId > 0) {
+            addPreferencesFromResource(resId);
-                addPreferencesFromResource(resId);
-            }
         }
     }
 
@@ -82,10 +80,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
         updateActivityTitleWithScreenTitle(getPreferenceScreen());
     }
 
-    public static boolean usePreferenceScreenTitle() {
-        return FeatureFlagUtils.isEnabled(FeatureFlags.USE_PREFERENCE_SCREEN_TITLE) || true;
-    }
-
     protected final Context getPrefContext() {
         return getPreferenceManager().getContext();
     }
@@ -102,7 +96,7 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
     }
 
     private void updateActivityTitleWithScreenTitle(PreferenceScreen screen) {
-        if (usePreferenceScreenTitle() && screen != null) {
+        if (screen != null) {
             final CharSequence title = screen.getTitle();
             if (!TextUtils.isEmpty(title)) {
                 getActivity().setTitle(title);

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

@@ -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(
-            final TypedArray a = context.obtainStyledAttributes(
+                attrs, new int[] { com.android.internal.R.attr.title },
-                    attrs, new int[] { com.android.internal.R.attr.title },
+                TypedArrayUtils.getAttr(
-                    TypedArrayUtils.getAttr(
+                        context, android.support.v7.preference.R.attr.preferenceStyle,
-                            context, android.support.v7.preference.R.attr.preferenceStyle,
+                        android.R.attr.preferenceStyle), 0);
-                            android.R.attr.preferenceStyle), 0);
+        mTitleRes = a.getResourceId(0, 0);
-            mTitleRes = a.getResourceId(0, 0);
+        a.recycle();
-            a.recycle();
-        }
     }
 
     @Override

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

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

src/com/android/settings/datetime/ZonePicker.java

@@ -35,7 +35,6 @@ import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settingslib.datetime.ZoneGetter;
@@ -167,9 +166,7 @@ public class ZonePicker extends ListFragment implements Instrumentable {
         // Sets the adapter
         setSorting(true);
         setHasOptionsMenu(true);
-        if (InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {
+        activity.setTitle(R.string.date_time_set_timezone);
-            activity.setTitle(R.string.date_time_set_timezone);
-        }
     }
 
     @Override

src/com/android/settings/display/ScreenZoomSettings.java

@@ -71,9 +71,7 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme
             mDefaultDensity = density.getDefaultDensity();
         }
 
-        if (usePreferenceScreenTitle()) {
+        getActivity().setTitle(R.string.screen_zoom_title);
-            getActivity().setTitle(R.string.screen_zoom_title);
-        }
     }
 
     @Override

src/com/android/settings/language/PhoneLanguagePreferenceController.java

@@ -68,8 +68,7 @@ public class PhoneLanguagePreferenceController extends AbstractPreferenceControl
 
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
-        if (!InstrumentedPreferenceFragment.usePreferenceScreenTitle()
+        if (!KEY_PHONE_LANGUAGE.equals(preference.getKey())) {
-                || !KEY_PHONE_LANGUAGE.equals(preference.getKey())) {
             return false;
         }
         Utils.startWithFragment(mContext, LocaleListEditor.class.getName(), null, null, 0,

src/com/android/settings/nfc/AndroidBeam.java

@@ -98,9 +98,7 @@ public class AndroidBeam extends InstrumentedPreferenceFragment
             mSwitchBar.show();
         }
 
-        if (usePreferenceScreenTitle()) {
+        activity.setTitle(R.string.android_beam_settings_title);
-            activity.setTitle(R.string.android_beam_settings_title);
-        }
     }
 
     @Override

src/com/android/settings/nfc/PaymentSettings.java

@@ -63,13 +63,7 @@ public class PaymentSettings extends SettingsPreferenceFragment implements Index
         mPaymentBackend = new PaymentBackend(getActivity());
         setHasOptionsMenu(true);
 
-        final PreferenceScreen screen;
+        final PreferenceScreen screen = getPreferenceScreen();
-        if (usePreferenceScreenTitle()) {
-            screen = getPreferenceScreen();
-        } else {
-            PreferenceManager manager = getPreferenceManager();
-            screen = manager.createPreferenceScreen(getActivity());
-        }
 
         List<PaymentBackend.PaymentAppInfo> appInfos = mPaymentBackend.getPaymentAppInfos();
         if (appInfos != null && appInfos.size() > 0) {
@@ -81,9 +75,6 @@ public class PaymentSettings extends SettingsPreferenceFragment implements Index
                     mPaymentBackend);
             screen.addPreference(foreground);
         }
-        if (!usePreferenceScreenTitle()) {
-            setPreferenceScreen(screen);
-        }
     }
 
     @Override

src/com/android/settings/notification/ZenAccessSettings.java

@@ -77,9 +77,6 @@ public class ZenAccessSettings extends EmptyTextSettings {
         mContext = getActivity();
         mPkgMan = mContext.getPackageManager();
         mNoMan = mContext.getSystemService(NotificationManager.class);
-        if (!usePreferenceScreenTitle()) {
-            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext));
-        }
     }
 
     @Override

src/com/android/settings/widget/RadioButtonPickerFragment.java

@@ -68,9 +68,6 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
-        if (!usePreferenceScreenTitle()) {
-            addPreferencesFromResource(R.xml.placeholder_prefs);
-        }
         updateCandidates();
     }
 

tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java

@@ -27,7 +27,6 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
-import android.util.FeatureFlagUtils;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -75,10 +74,6 @@ public class InstrumentedPreferenceFragmentTest {
 
     @Test
     public void onCreatePreferences_noPreferenceScreenResId_shouldNotAddPreference() {
-        SettingsShadowSystemProperties.set(
-                FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.USE_PREFERENCE_SCREEN_TITLE,
-                "true");
-
         mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);
 
         verify(mFragment, never()).addPreferencesFromResource(anyInt());
@@ -86,9 +81,6 @@ public class InstrumentedPreferenceFragmentTest {
 
     @Test
     public void onCreatePreferences_gotPreferenceScreenResId_shouldAddPreferences() {
-        SettingsShadowSystemProperties.set(
-                FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.USE_PREFERENCE_SCREEN_TITLE,
-                "true");
         mFragment.setPreferenceScreenResId(R.xml.screen_pinning_settings);
         when(mFragment.getActivity()).thenReturn(mActivity);
 
@@ -100,9 +92,6 @@ public class InstrumentedPreferenceFragmentTest {
 
     @Test
     public void onCreatePreferences_gotPrefScreenResIdAndTitle_shouldAddPreferencesAndSetTitle() {
-        SettingsShadowSystemProperties.set(
-                FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.USE_PREFERENCE_SCREEN_TITLE,
-                "true");
         mFragment.setPreferenceScreenResId(R.xml.screen_pinning_settings);
         when(mFragment.getActivity()).thenReturn(mActivity);
         final CharSequence title = "Test Title";