Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 233d88ce authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Turn on the feature flag for Android S Settings." into sc-dev am: 421ce84d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8add5d9c955a74dddae0c8bab9af9c1d9e3f64c5
parents 59964fcb 421ce84d

core/java/android/util/FeatureFlagUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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");

    }