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

Commit 59cd53b1 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

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

Merge "Send ChannelDialogController finish message on dismiss" into qt-r1-dev am: 0497a187 am: f2a72eec
am: 441dc226

Change-Id: I2943eecbc6fbfa31d03349d14ec97040b08aca8e
parents 2eaec699 441dc226

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

+6 −1
Original line number Diff line number Diff line
@@ -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