From a80fbaa9f0d1bfea0316a5a60b14954d79f87b62 Mon Sep 17 00:00:00 2001 From: yuanjiahsu Date: Thu, 6 Sep 2018 19:23:52 +0800 Subject: Add feature flag in Settings. User can enable/disable faster emergency phone call feature by switching this flag from Settings, and the old flag switched by adb command was replaced by this feature flag. Test: Manually Bug: 112168722 Bug: 113539598 Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d Merged-In: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d --- core/java/android/provider/Settings.java | 8 -------- core/java/android/util/FeatureFlagUtils.java | 2 ++ core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 - .../com/android/systemui/globalactions/GlobalActionsDialog.java | 5 +++-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index de621e38a72b..501d7f1d97c9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11235,14 +11235,6 @@ public final class Settings { */ public static final String EMERGENCY_AFFORDANCE_NEEDED = "emergency_affordance_needed"; - /** - * Enable faster emergency phone call feature. - * The value is a boolean (1 or 0). - * @hide - */ - public static final String FASTER_EMERGENCY_PHONE_CALL_ENABLED = - "faster_emergency_phone_call_enabled"; - /** * See RIL_PreferredNetworkType in ril.h * @hide diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 01e2db2e3939..97be52273cd5 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -35,6 +35,7 @@ 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"; private static final Map DEFAULT_FLAGS; static { @@ -47,6 +48,7 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put("settings_audio_switcher", "true"); DEFAULT_FLAGS.put("settings_systemui_theme", "true"); DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "true"); + DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "false"); } /** diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 418b8953d68a..c4a3b7ab11af 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -237,7 +237,6 @@ public class SettingsBackupTest { Settings.Global.EUICC_SUPPORTED_COUNTRIES, Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS, Settings.Global.FANCY_IME_ANIMATIONS, - Settings.Global.FASTER_EMERGENCY_PHONE_CALL_ENABLED, Settings.Global.FORCE_ALLOW_ON_EXTERNAL, Settings.Global.FORCED_APP_STANDBY_ENABLED, Settings.Global.FORCED_APP_STANDBY_FOR_SMALL_BATTERY_ENABLED, diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 00758e8e1297..f4cdbac9f223 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -55,6 +55,7 @@ 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; @@ -318,8 +319,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, ArraySet addedKeys = new ArraySet(); mHasLogoutButton = false; mHasLockdownButton = false; - mSeparatedEmergencyButtonEnabled = Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.FASTER_EMERGENCY_PHONE_CALL_ENABLED, 0) != 0; + mSeparatedEmergencyButtonEnabled = FeatureFlagUtils + .isEnabled(mContext, FeatureFlagUtils.EMERGENCY_DIAL_SHORTCUTS); for (int i = 0; i < defaultActions.length; i++) { String actionKey = defaultActions[i]; if (addedKeys.contains(actionKey)) { -- cgit v1.2.3-59-g8ed1b From 8af3a2416e40a9a1cfc1dd2114a771ef1bca918b Mon Sep 17 00:00:00 2001 From: Shaotang Li Date: Thu, 2 Aug 2018 11:18:00 +0800 Subject: Add new metrics in power menu These include, 1. An event indicating that power menu is shown. 2. An event indicating that user taps the emergency dialer icon. Bug: 112168722 Bug: 111378820 Test: manual and check the result of 'adb logcat -b events | grep sysui_multi_action' Change-Id: I958ed1af65f559e4999517031cd80fbb1c417108 Merged-In: I958ed1af65f559e4999517031cd80fbb1c417108 --- .../android/systemui/globalactions/GlobalActionsDialog.java | 9 ++++++++- proto/src/metrics_constants.proto | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index f4cdbac9f223..3eb49be71fa2 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -102,7 +102,7 @@ import java.util.List; * is provisioned. */ class GlobalActionsDialog implements DialogInterface.OnDismissListener, - DialogInterface.OnClickListener { + DialogInterface.OnClickListener, DialogInterface.OnShowListener { static public final String SYSTEM_DIALOG_REASON_KEY = "reason"; static public final String SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS = "globalactions"; @@ -399,6 +399,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, dialog.setKeyguardShowing(mKeyguardShowing); dialog.setOnDismissListener(this); + dialog.setOnShowListener(this); return dialog; } @@ -457,6 +458,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, @Override public void onPress() { + MetricsLogger.action(mContext, MetricsEvent.ACTION_EMERGENCY_DIALER_FROM_POWER_MENU); Intent intent = new Intent(EmergencyDialerConstants.ACTION_DIAL); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.putExtra(EmergencyDialerConstants.EXTRA_ENTRY_TYPE, @@ -863,6 +865,11 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, item.onPress(); } + /** {@inheritDoc} */ + public void onShow(DialogInterface dialog) { + MetricsLogger.visible(mContext, MetricsEvent.POWER_MENU); + } + /** * The adapter used for the list within the global actions dialog, taking * into account whether the keyguard is showing via diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index b990175fd616..d79d833f2233 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -6482,6 +6482,16 @@ message MetricsEvent { // OS: Q FIELD_EMERGENCY_DIALER_SHORTCUT_TAPS_INTERVAL = 1567; + // OPEN: Power menu is opened + // CATEGORY: GLOBAL_SYSTEM_UI + // OS: Q + POWER_MENU = 1568; + + // ACTION: User tapped emergency dialer icon in the power menu. + // CATEGORY: GLOBAL_SYSTEM_UI + // OS: Q + ACTION_EMERGENCY_DIALER_FROM_POWER_MENU = 1569; + // ---- End Q Constants, all Q constants go above this line ---- // Add new aosp constants above this line. -- cgit v1.2.3-59-g8ed1b From 82e5908df04db95235aea76e58fa4bd5acb99afe Mon Sep 17 00:00:00 2001 From: Leo Hsu Date: Tue, 2 Oct 2018 10:18:52 +0800 Subject: RESTRICT AUTOMERGE: Removes feature flag for faster emergency call. Removes feature flag and enables faster emergency call features by default. Test: Manually Bug: 112168722 Bug: 117128459 Change-Id: I81e64a229598b8c11a721a0dee7033f6ae3e4fdd --- core/java/android/util/FeatureFlagUtils.java | 2 -- .../src/com/android/systemui/globalactions/GlobalActionsDialog.java | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 97be52273cd5..01e2db2e3939 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -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"; private static final Map DEFAULT_FLAGS; static { @@ -48,7 +47,6 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put("settings_audio_switcher", "true"); DEFAULT_FLAGS.put("settings_systemui_theme", "true"); DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "true"); - DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "false"); } /** diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 3eb49be71fa2..897ab88215ef 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 addedKeys = new ArraySet(); 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