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

Merge "Send ChannelDialogController finish message on dismiss" into qt-r1-dev

Browse Source 
am: 0497a18767

Change-Id: I68a104278a20bfea0f1881a75fd9cfe7b9c00095
This commit is contained in:
Evan Laird
2019-07-30 13:28:23 -07:00
committed by android-build-merger
parent 241ba4f10c 0497a18767
commit f2a72eec27
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt
View File

@@ -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