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

Commit 0286f756 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove channel priority icons from half-shelf" into qt-dev

parents 35d6dece d3e55cf2

packages/SystemUI/res/layout/notif_half_shelf_row.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,8 @@ 
    android:padding="8dp"

    android:padding="8dp"

    android:orientation="horizontal" >

    android:orientation="horizontal" >





    <ImageView

    <!-- This is where an icon would go *if we wanted one* **wink** -->

    <Space

        android:id="@+id/icon"

        android:id="@+id/icon"

        android:layout_height="48dp"

        android:layout_height="48dp"

        android:layout_width="48dp"

        android:layout_width="48dp"

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -117,7 +117,6 @@ class AppControlView(c: Context, attrs: AttributeSet) : LinearLayout(c, attrs) { 
class ChannelRow(c: Context, attrs: AttributeSet) : LinearLayout(c, attrs) {

class ChannelRow(c: Context, attrs: AttributeSet) : LinearLayout(c, attrs) {





    lateinit var controller: ChannelEditorDialogController

    lateinit var controller: ChannelEditorDialogController

    private lateinit var iconView: ImageView

    private lateinit var channelName: TextView

    private lateinit var channelName: TextView

    private lateinit var channelDescription: TextView

    private lateinit var channelDescription: TextView

    private lateinit var switch: Switch

    private lateinit var switch: Switch
@@ -131,7 +130,6 @@ class ChannelRow(c: Context, attrs: AttributeSet) : LinearLayout(c, attrs) { 
        }

        }





    override fun onFinishInflate() {

    override fun onFinishInflate() {

        iconView = findViewById(R.id.icon)

        channelName = findViewById(R.id.channel_name)

        channelName = findViewById(R.id.channel_name)

        channelDescription = findViewById(R.id.channel_description)

        channelDescription = findViewById(R.id.channel_description)

        switch = findViewById(R.id.toggle)

        switch = findViewById(R.id.toggle)
@@ -145,11 +143,6 @@ class ChannelRow(c: Context, attrs: AttributeSet) : LinearLayout(c, attrs) { 
    private fun updateViews() {

    private fun updateViews() {

        val nc = channel ?: return

        val nc = channel ?: return





        iconView.setImageDrawable(

                if (gentle)

                    context.getDrawable(R.drawable.ic_notification_gentle)

                else context.getDrawable(R.drawable.ic_notification_interruptive))



        channelName.text = nc.name ?: "(missing)"

        channelName.text = nc.name ?: "(missing)"





        nc.group?.let { groupId ->

        nc.group?.let { groupId ->