Merge "Add new metrics in power menu" (467882c4) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,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";
		@@ -397,6 +397,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		dialog.setKeyguardShowing(mKeyguardShowing);

		dialog.setOnDismissListener(this);
		dialog.setOnShowListener(this);

		return dialog;
		}
		@@ -458,6 +459,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener,

		@Override
		public void onPress() {
		MetricsLogger.action(mContext, MetricsEvent.ACTION_EMERGENCY_DIALER_FROM_POWER_MENU);
		Intent intent = new Intent(ACTION_EMERGENCY_DIALER_DIAL);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_ACTIVITY_CLEAR_TOP);
		mContext.startActivityAsUser(intent, UserHandle.CURRENT);
		@@ -862,6 +864,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

+10 −0

Original line number	Diff line number	Diff line
		@@ -6498,6 +6498,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.