Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d7858f4 authored by Chris Wren's avatar Chris Wren Committed by android-build-merger
Browse files

am aeca1baf: Merge "Add event logs when we launch fullscreen notications."...

am aeca1baf: Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev automerge: 56c10377
automerge: 3aa19984

* commit '3aa19984':
  Add event logs when we launch fullscreen notications.
parents 9161b1ac 3aa19984
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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
+7 −0
Original line number Diff line number Diff line
@@ -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) {
                }