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
2017-11-13 17:58:13 -08:00
parent bbdc72c95a
commit 4a01283309
34 changed files with 40 additions and 174 deletions
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/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