From 2c69b0b487e23d8213ba8bbc5db4f84cae5af4b0 Mon Sep 17 00:00:00 2001
From: yuanjiahsu <yuanjiahsu@google.com>
Date: Fri, 16 Nov 2018 21:37:33 +0800
Subject: Modify feature flag of Personal Safety

1.Remove feature flag and let Emergency Dialer Shortcut feature always
enabled.
2.Add feature flag for Safety Hub (the bug ID to clean up this feature flag is b/118848485).

Test: Manually
Bug: 117128459
Bug: 118809382
Change-Id: I0a3819629bc579d93c682451abdf271d0b36bf59
---
 core/java/android/util/FeatureFlagUtils.java                          | 4 ++--
 .../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)) {
-- 
cgit v1.2.3-59-g8ed1b