From 223c66b6812f5f07ce89cc5bbf7d07d62bcc488f Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Mon, 10 Nov 2014 16:00:09 -0500 Subject: [PATCH] Add event logs when we launch fullscreen notications. When the heads up does not trigger on enqueue, and also when a heads up is escalated to a fullscreen on a screen event. Bug: 16644299 Change-Id: Iec7f7ddb966b46171d0e7d1ee52daf5847a7c9da --- .../SystemUI/src/com/android/systemui/EventLogTags.logtags | 2 ++ .../android/systemui/statusbar/phone/PhoneStatusBar.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags b/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags index 5f2c348182685..633795648afc5 100644 --- a/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags +++ b/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags @@ -7,6 +7,8 @@ option java_package com.android.systemui; # --------------------------- 36000 sysui_statusbar_touch (type|1),(x|1),(y|1),(enabled|1) 36001 sysui_heads_up_status (key|3),(visible|1) +36002 sysui_fullscreen_notification (key|3) +36003 sysui_heads_up_escalation (key|3) # --------------------------- # PhoneStatusBarView.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index ce2ce6b62b723..169764653c3a7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1309,6 +1309,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, // not immersive & a full-screen alert should be shown if (DEBUG) Log.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent"); try { + EventLog.writeEvent(EventLogTags.SYSUI_FULLSCREEN_NOTIFICATION, + notification.getKey()); notification.getNotification().fullScreenIntent.send(); } catch (PendingIntent.CanceledException e) { } @@ -1350,16 +1352,19 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public void scheduleHeadsUpOpen() { + mHandler.removeMessages(MSG_SHOW_HEADS_UP); mHandler.sendEmptyMessage(MSG_SHOW_HEADS_UP); } @Override public void scheduleHeadsUpClose() { + mHandler.removeMessages(MSG_HIDE_HEADS_UP); mHandler.sendEmptyMessage(MSG_HIDE_HEADS_UP); } @Override public void scheduleHeadsUpEscalation() { + mHandler.removeMessages(MSG_ESCALATE_HEADS_UP); mHandler.sendEmptyMessage(MSG_ESCALATE_HEADS_UP); } @@ -2194,6 +2199,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, if (DEBUG) Log.d(TAG, "converting a heads up to fullScreen"); try { + EventLog.writeEvent(EventLogTags.SYSUI_HEADS_UP_ESCALATION, + sbn.getKey()); notification.fullScreenIntent.send(); } catch (PendingIntent.CanceledException e) { }