Merge "Update volume logging" into pi-dev (1691d42e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/Events.java

+29 −20

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ public class Events {
		public static final int EVENT_MUTE_CHANGED = 15; // (stream\|int) (muted\|bool)
		public static final int EVENT_TOUCH_LEVEL_DONE = 16; // (stream\|int) (level\|bool)
		public static final int EVENT_ZEN_CONFIG_CHANGED = 17; // (allow/disallow\|string)
		public static final int EVENT_RINGER_TOGGLE = 18; // (ringer_mode)

		private static final String[] EVENT_TAGS = {
		"show_dialog",
		@@ -72,6 +73,7 @@ public class Events {
		"mute_changed",
		"touch_level_done",
		"zen_mode_config_changed",
		"ringer_toggle"
		};

		public static final int DISMISS_REASON_UNKNOWN = 0;
		@@ -112,6 +114,7 @@ public class Events {
		public static Callback sCallback;

		public static void writeEvent(Context context, int tag, Object... list) {
		MetricsLogger logger = new MetricsLogger();
		final long time = System.currentTimeMillis();
		final StringBuilder sb = new StringBuilder("writeEvent ").append(EVENT_TAGS[tag]);
		if (list != null && list.length > 0) {
		@@ -139,7 +142,7 @@ public class Events {
		break;
		case EVENT_ICON_CLICK:
		MetricsLogger.action(context, MetricsEvent.ACTION_VOLUME_ICON,
		(Integer) list[1]);
		(Integer) list[0]);
		sb.append(AudioSystem.streamToString((Integer) list[0])).append(' ')
		.append(iconStateToString((Integer) list[1]));
		break;
		@@ -155,10 +158,16 @@ public class Events {
		break;
		case EVENT_KEY:
		MetricsLogger.action(context, MetricsEvent.ACTION_VOLUME_KEY,
		(Integer) list[1]);
		(Integer) list[0]);
		sb.append(AudioSystem.streamToString((Integer) list[0])).append(' ')
		.append(list[1]);
		break;
		case EVENT_RINGER_TOGGLE:
		logger.action(MetricsEvent.ACTION_VOLUME_RINGER_TOGGLE, (Integer) list[0]);
		break;
		case EVENT_SETTINGS_CLICK:
		logger.action(MetricsEvent.ACTION_VOLUME_SETTINGS);
		break;
		case EVENT_EXTERNAL_RINGER_MODE_CHANGED:
		MetricsLogger.action(context, MetricsEvent.ACTION_RINGER_MODE,
		(Integer) list[0]);

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -415,6 +415,7 @@ public class VolumeDialogImpl implements VolumeDialog {
		mSettingsView.setVisibility(
		mDeviceProvisionedController.isDeviceProvisioned() ? VISIBLE : GONE);
		mSettingsIcon.setOnClickListener(v -> {
		Events.writeEvent(mContext, Events.EVENT_SETTINGS_CLICK);
		Intent intent = new Intent(Settings.ACTION_SOUND_SETTINGS);
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		dismissH(DISMISS_REASON_SETTINGS_CLICKED);
		@@ -424,8 +425,6 @@ public class VolumeDialogImpl implements VolumeDialog {

		public void initRingerH() {
		mRingerIcon.setOnClickListener(v -> {
		Events.writeEvent(mContext, Events.EVENT_ICON_CLICK, AudioManager.STREAM_RING,
		mRingerIcon.getTag());
		Prefs.putBoolean(mContext, Prefs.Key.TOUCHED_RINGER_TOGGLE, true);
		final StreamState ss = mState.states.get(AudioManager.STREAM_RING);
		if (ss == null) {
		@@ -449,6 +448,7 @@ public class VolumeDialogImpl implements VolumeDialog {
		mController.setStreamVolume(AudioManager.STREAM_RING, 1);
		}
		}
		Events.writeEvent(mContext, Events.EVENT_RINGER_TOGGLE, newRingerMode);
		updateRingerH();
		provideTouchFeedbackH(newRingerMode);
		mController.setRingerMode(newRingerMode, false);

proto/src/metrics_constants.proto

+9 −0

Original line number	Diff line number	Diff line
		@@ -5636,6 +5636,15 @@ message MetricsEvent {
		// OS: P
		NOTIFICATION_SMART_REPLY_COUNT = 1384;

		// Volume dialog > ringer toggle
		// OS: P
		ACTION_VOLUME_RINGER_TOGGLE = 1385;

		// Volume dialog > settings button
		// OS: P
		ACTION_VOLUME_SETTINGS = 1386;


		// ---- End P Constants, all P constants go above this line ----
		// Add new aosp constants above this line.
		// END OF AOSP CONSTANTS