From ac8cb3520874f0d8a3509eefba39c0fc1358934f Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Tue, 31 Oct 2017 11:40:22 -0700 Subject: [PATCH] Switch to use new activity title handling. Bug: 64564191 Test: make RunSettingsRoboTests Change-Id: I66894c1541ea483ab4fe4b1b68ba5f94b9a5e210 --- .../settings/core/InstrumentedPreferenceFragment.java | 2 +- .../core/InstrumentedPreferenceFragmentTest.java | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index 8ef8c0e95fb..5b95d6670c7 100644 --- 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() { diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java index ab7228c9c97..30d60ccfab5 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -73,17 +73,6 @@ public class InstrumentedPreferenceFragmentTest { SettingsShadowSystemProperties.clear(); } - @Test - public void onCreatePreferences_preferenceScreenTitleFeatureOff_shouldNotAddPreference() { - SettingsShadowSystemProperties.set( - FeatureFlagUtils.FFLAG_PREFIX + mFragment.FEATURE_FLAG_USE_PREFERENCE_SCREEN_TITLE, - "false"); - - mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */); - - verify(mFragment, never()).addPreferencesFromResource(anyInt()); - } - @Test public void onCreatePreferences_noPreferenceScreenResId_shouldNotAddPreference() { SettingsShadowSystemProperties.set(