Merge "Switch to use new activity title handling."

2017-10-31 21:16:44 +00:00
parent e717a5fdd1 ac8cb35208
commit f8091755e7
2 changed files with 1 additions and 12 deletions
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -85,7 +85,7 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
    }

    public static boolean usePreferenceScreenTitle() {
-        return FeatureFlagUtils.isEnabled(FEATURE_FLAG_USE_PREFERENCE_SCREEN_TITLE);
+        return FeatureFlagUtils.isEnabled(FEATURE_FLAG_USE_PREFERENCE_SCREEN_TITLE) || true;
    }

    protected final Context getPrefContext() {