Merge "Revert "Turn on the feature flag for Android S Settings."" into sc-dev am: 81f656e07f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfa7b3ebfb44f90044314306612e718ee09c8099
This commit is contained in:
TreeHugger Robot
2021-02-03 21:55:02 +00:00
committed by Automerger Merge Worker

View File

@@ -65,7 +65,7 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, "true");
DEFAULT_FLAGS.put("settings_tether_all_in_one", "false");
DEFAULT_FLAGS.put("settings_silky_home", "true");
DEFAULT_FLAGS.put("settings_silky_home", "false");
DEFAULT_FLAGS.put("settings_contextual_home", "false");
DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "false");
}