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

Commit d3e55cf2 authored by Evan Laird's avatar Evan Laird
Browse files

Remove channel priority icons from half-shelf 

Don't show the priority/gentle icons on the channel editor dialog view.
Don't bother removing the ImageView from the layout in case we decide to
bring it back though

Bug: 132689331
Test: visual
Change-Id: Ifffcfa8ec36ce25dab99a020faa15ac4cb1ab4d3
parent 2c163664

packages/SystemUI/res/layout/notif_half_shelf_row.xml

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

    android:orientation="horizontal" >



    <ImageView

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

    <Space

        android:id="@+id/icon"

        android:layout_height="48dp"

        android:layout_width="48dp"

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

+0 −7
Original line number 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) {



    lateinit var controller: ChannelEditorDialogController

    private lateinit var iconView: ImageView

    private lateinit var channelName: TextView

    private lateinit var channelDescription: TextView

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



    override fun onFinishInflate() {

        iconView = findViewById(R.id.icon)

        channelName = findViewById(R.id.channel_name)

        channelDescription = findViewById(R.id.channel_description)

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

        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)"



        nc.group?.let { groupId ->