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:
Doris Ling
2017-11-13 17:58:13 -08:00
parent bbdc72c95a
commit 4a01283309
34 changed files with 40 additions and 174 deletions

View File

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