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

Commit b39b469b authored by yuanjiahsu's avatar yuanjiahsu
Browse files

resolve merge conflicts of 183271d1 to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I219a85189fb4207a0605ca541f8ecc29f5ee6808
parents 5e2f5f27 183271d1

core/java/android/util/FeatureFlagUtils.java

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ public class FeatureFlagUtils { 
    public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override.";

    public static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;

    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts";

    public static final String SAFETY_HUB = "settings_safety_hub";

    public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";
@@ -49,7 +48,6 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_data_usage_v2", "true");

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

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

        DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "true");

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

        DEFAULT_FLAGS.put(SAFETY_HUB, "false");

        DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+1 −2
Original line number Diff line number Diff line
@@ -326,8 +326,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        ArraySet<String> addedKeys = new ArraySet<String>();

        mHasLogoutButton = false;

        mHasLockdownButton = false;

        mSeparatedEmergencyButtonEnabled = FeatureFlagUtils

                .isEnabled(mContext, FeatureFlagUtils.EMERGENCY_DIAL_SHORTCUTS);

        mSeparatedEmergencyButtonEnabled = true;

        for (int i = 0; i < defaultActions.length; i++) {

            String actionKey = defaultActions[i];

            if (addedKeys.contains(actionKey)) {