Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am aeca1baf: Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev

Browse Source 
automerge: 56c1037

* commit '56c1037767fd77116c8de4021a56d761c6bd288c':
  Add event logs when we launch fullscreen notications.
This commit is contained in:
Chris Wren
2014-11-11 22:14:44 +00:00
committed by android-build-merger
parent f82ab735a7 56c1037767
commit 3aa19984ad
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/EventLogTags.logtags
View File

@@ -7,6 +7,8 @@ option java_package com.android.systemui;
# --------------------------- # ---------------------------
36000 sysui_statusbar_touch (type|1),(x|1),(y|1),(enabled|1) 36000 sysui_statusbar_touch (type|1),(x|1),(y|1),(enabled|1)
36001 sysui_heads_up_status (key|3),(visible|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 # PhoneStatusBarView.java

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -1309,6 +1309,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
// not immersive & a full-screen alert should be shown // not immersive & a full-screen alert should be shown
if (DEBUG) Log.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent"); if (DEBUG) Log.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent");
try { try {
EventLog.writeEvent(EventLogTags.SYSUI_FULLSCREEN_NOTIFICATION,
notification.getKey());
notification.getNotification().fullScreenIntent.send(); notification.getNotification().fullScreenIntent.send();
} catch (PendingIntent.CanceledException e) { } catch (PendingIntent.CanceledException e) {
} }
@@ -1350,16 +1352,19 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
@Override @Override
public void scheduleHeadsUpOpen() { public void scheduleHeadsUpOpen() {
mHandler.removeMessages(MSG_SHOW_HEADS_UP);
mHandler.sendEmptyMessage(MSG_SHOW_HEADS_UP); mHandler.sendEmptyMessage(MSG_SHOW_HEADS_UP);
} }
@Override @Override
public void scheduleHeadsUpClose() { public void scheduleHeadsUpClose() {
mHandler.removeMessages(MSG_HIDE_HEADS_UP);
mHandler.sendEmptyMessage(MSG_HIDE_HEADS_UP); mHandler.sendEmptyMessage(MSG_HIDE_HEADS_UP);
} }
@Override @Override
public void scheduleHeadsUpEscalation() { public void scheduleHeadsUpEscalation() {
mHandler.removeMessages(MSG_ESCALATE_HEADS_UP);
mHandler.sendEmptyMessage(MSG_ESCALATE_HEADS_UP); mHandler.sendEmptyMessage(MSG_ESCALATE_HEADS_UP);
} }
@@ -2194,6 +2199,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
if (DEBUG) if (DEBUG)
Log.d(TAG, "converting a heads up to fullScreen"); Log.d(TAG, "converting a heads up to fullScreen");
try { try {
EventLog.writeEvent(EventLogTags.SYSUI_HEADS_UP_ESCALATION,
sbn.getKey());
notification.fullScreenIntent.send(); notification.fullScreenIntent.send();
} catch (PendingIntent.CanceledException e) { } catch (PendingIntent.CanceledException e) {
} }