Merge "Make Settings UI fuse flag "settings_fuse" persistent"

This commit is contained in:
Abhijeet Kaur
2019-12-02 15:48:28 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 0 deletions

View File

@@ -23,6 +23,7 @@ public class FeatureFlags {
public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher"; public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
public static final String DYNAMIC_SYSTEM = "settings_dynamic_system"; public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";
public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
public static final String SETTINGS_FUSE_FLAG = "settings_fuse";
public static final String WIFI_DETAILS_DATAUSAGE_HEADER = public static final String WIFI_DETAILS_DATAUSAGE_HEADER =
"settings_wifi_details_datausage_header"; "settings_wifi_details_datausage_header";
public static final String PERSONAL_WORK_PROFILE = "settings_work_profile"; public static final String PERSONAL_WORK_PROFILE = "settings_work_profile";

View File

@@ -36,6 +36,7 @@ public class FeatureFlagPersistent {
PERSISTENT_FLAGS = new HashSet<>(); PERSISTENT_FLAGS = new HashSet<>();
PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS); PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS);
PERSISTENT_FLAGS.add(FeatureFlags.DYNAMIC_SYSTEM); PERSISTENT_FLAGS.add(FeatureFlags.DYNAMIC_SYSTEM);
PERSISTENT_FLAGS.add(FeatureFlags.SETTINGS_FUSE_FLAG);
} }
public static boolean isEnabled(Context context, String feature) { public static boolean isEnabled(Context context, String feature) {