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

am: 0286f7568b

Change-Id: I85a31efe1ff7872cb74f9ba78c7f9774bd2ea658

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"

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