PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to use new activity title handling."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-31 21:16:44 +00:00
committed by Android (Google) Code Review
parent e717a5fdd1 ac8cb35208
commit f8091755e7
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/core/InstrumentedPreferenceFragment.java
View File

@@ -85,7 +85,7 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
} }
public static boolean usePreferenceScreenTitle() { 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() { protected final Context getPrefContext() {

11
tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
View File

@@ -73,17 +73,6 @@ public class InstrumentedPreferenceFragmentTest {
SettingsShadowSystemProperties.clear(); 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 @Test
public void onCreatePreferences_noPreferenceScreenResId_shouldNotAddPreference() { public void onCreatePreferences_noPreferenceScreenResId_shouldNotAddPreference() {
SettingsShadowSystemProperties.set( SettingsShadowSystemProperties.set(