diff options
| author | 2019-07-25 15:04:38 -0400 | |
|---|---|---|
| committer | 2019-07-25 15:06:38 -0400 | |
| commit | bd2c943af39ae7748b7c69b56ad9e355e2f45315 (patch) | |
| tree | 1957d818f53dcdc160c5beb5e82dec48559b5573 | |
| parent | b765c6056893eb907751ec5788557f76e7073006 (diff) | |
Send ChannelDialogController finish message on dismiss
NotificationInfo keeps track of whether or not it's presenting the
channel dialog editor, but was missing messages from the "tap outside"
dismissal of the dialog and would not present the dialog on subesquent
taps. This change makes the controller send the finish message on any
dismiss event
Fixes: 135484257
Test: atest ChannelEditorDialogControllerTest; visual
Change-Id: I25a124e4d875c146024a2051cd7c2e896d801c23
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt index 8e6822770694..782aad17345e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt @@ -23,6 +23,7 @@ import android.app.NotificationChannel.DEFAULT_CHANNEL_ID import android.app.NotificationChannelGroup import android.app.NotificationManager.IMPORTANCE_NONE import android.content.Context +import android.content.DialogInterface import android.graphics.Color import android.graphics.PixelFormat import android.graphics.drawable.Drawable @@ -171,7 +172,6 @@ class ChannelEditorDialogController @Inject constructor( private fun done() { resetState() dialog.dismiss() - onFinishListener?.onChannelEditorDialogFinished() } private fun resetState() { @@ -261,6 +261,11 @@ class ChannelEditorDialogController @Inject constructor( dialog.apply { setContentView(R.layout.notif_half_shelf) setCanceledOnTouchOutside(true) + setOnDismissListener(object : DialogInterface.OnDismissListener { + override fun onDismiss(dialog: DialogInterface?) { + onFinishListener?.onChannelEditorDialogFinished() + } + }) findViewById<ChannelEditorListView>(R.id.half_shelf_container).apply { controller = this@ChannelEditorDialogController appIcon = this@ChannelEditorDialogController.appIcon |