From d3e55cf22aa2c8c00b1db8120dddb9ae8d4028e8 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Thu, 23 May 2019 16:58:50 -0400
Subject: [PATCH] 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
---
 packages/SystemUI/res/layout/notif_half_shelf_row.xml      | 3 ++-
 .../statusbar/notification/row/ChannelEditorListView.kt    | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/SystemUI/res/layout/notif_half_shelf_row.xml b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
index 17ea931a4f8c1..1b804556d146c 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf_row.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
@@ -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"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorListView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorListView.kt
index 7fea30c607f69..4d4976085ba98 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorListView.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorListView.kt
@@ -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 ->