| commit | e9b3cf634b7d370ea3a367a375b8ef5a5ee451f6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Dec 30 01:07:50 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 30 01:07:50 2024 -0800 |
| tree | 2b8dbaa70e5637c8f46b2070e7689a9ba3d7363c | |
| parent | 48600a9503255796b4c65392a1e9fff0e3f1f415 [diff] | |
| parent | e14f6ea8586e0b2a3417d6d9f3a62968a297643b [diff] |
Merge "Heads-up notification for port forwarding" into main am: 1df36eeba8 am: e14f6ea858 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3433405 Change-Id: I26616860e723dd5944898bbac9d5021155662fa5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/BaseActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/BaseActivity.java index d6ca1e6..aeae5dd 100644 --- a/android/TerminalApp/java/com/android/virtualization/terminal/BaseActivity.java +++ b/android/TerminalApp/java/com/android/virtualization/terminal/BaseActivity.java
@@ -36,7 +36,7 @@ new NotificationChannel( this.getPackageName(), getString(R.string.app_name), - NotificationManager.IMPORTANCE_DEFAULT); + NotificationManager.IMPORTANCE_HIGH); notificationManager.createNotificationChannel(channel); }
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/PortNotifier.kt b/android/TerminalApp/java/com/android/virtualization/terminal/PortNotifier.kt index dd58e0a..7a07dfe 100644 --- a/android/TerminalApp/java/com/android/virtualization/terminal/PortNotifier.kt +++ b/android/TerminalApp/java/com/android/virtualization/terminal/PortNotifier.kt
@@ -100,9 +100,10 @@ .setSmallIcon(R.drawable.ic_launcher_foreground) .setContentTitle(title) .setContentText(content) - .setContentIntent(tapPendingIntent) + .setFullScreenIntent(tapPendingIntent, true) .addAction(acceptAction) .addAction(denyAction) + .setAutoCancel(true) .build() notificationManager.notify(TAG, port, notification) }