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