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

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfa7b3ebfb44f90044314306612e718ee09c8099
parents 9c2fe01d 81f656e0

core/java/android/util/FeatureFlagUtils.java

+1 −1
Original line number Original line 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_DO_NOT_RESTORE_PRESERVED, "true");





        DEFAULT_FLAGS.put("settings_tether_all_in_one", "false");

        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_contextual_home", "false");

        DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "false");

        DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "false");

    }

    }