summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-02-03 04:58:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-02-03 04:58:28 +0000
commit421ce84db7ef4e081cfd4eece04ed5c42efea5d4 (patch)
tree44e989437730819e9a540bbc1fa8fd7cfdb0c17f /core/java/android
parentbad7328c54c3fcabd5aac240e8b90e357a05656f (diff)
parent0197d41019204c8451617e5367ddfd43ea2bc749 (diff)
Merge "Turn on the feature flag for Android S Settings." into sc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/util/FeatureFlagUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index b22921233f05..790773fd83c5 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -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", "false");
+ DEFAULT_FLAGS.put("settings_silky_home", "true");
DEFAULT_FLAGS.put("settings_contextual_home", "false");
DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "false");
}