diff options
| author | 2018-11-19 23:12:33 -0800 | |
|---|---|---|
| committer | 2018-11-19 23:12:33 -0800 | |
| commit | 183271d1d240fb2a92628e00b132b4490461f59f (patch) | |
| tree | 94b0cfa346588c8ba13b289514d6bd8d8b742ab9 | |
| parent | c3f416b6cd3694db6d3c2ecc6a846c4dd3efe0e4 (diff) | |
| parent | 4f4e52c1b94d5a76769e1ff672bc9f202ef01657 (diff) | |
Merge "Modify feature flag of Personal Safety" am: b4a197ca39
am: 4f4e52c1b9
Change-Id: Iebde195a7f6fd86cae357169fae76368df9727b4
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index b77d88159492..32866c5c785a 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -33,9 +33,9 @@ public class FeatureFlagUtils { public static final String FFLAG_PREFIX = "sys.fflag."; public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override."; - public static final String EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts"; 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 SAFETY_HUB = "settings_safety_hub"; private static final Map<String, String> DEFAULT_FLAGS; static { @@ -47,8 +47,8 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put("settings_data_usage_v2", "true"); DEFAULT_FLAGS.put("settings_audio_switcher", "true"); DEFAULT_FLAGS.put("settings_systemui_theme", "true"); - DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "false"); DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false"); + DEFAULT_FLAGS.put(SAFETY_HUB, "false"); } /** diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index f4cdbac9f223..28f86ec28626 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -55,7 +55,6 @@ import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.ArraySet; -import android.util.FeatureFlagUtils; import android.util.Log; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; @@ -319,8 +318,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)) { |