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/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;
-        if (usePreferenceScreenTitle()) {
-            screen = getPreferenceScreen();
-        } else {
-            PreferenceManager manager = getPreferenceManager();
-            screen = manager.createPreferenceScreen(getActivity());
-        }
+        final PreferenceScreen screen = getPreferenceScreen();
 
         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