Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 0286f7568b

Change-Id: I85a31efe1ff7872cb74f9ba78c7f9774bd2ea658
This commit is contained in:
Evan Laird
2019-05-24 19:18:40 -07:00
committed by android-build-merger
parent 0620646be0 0286f7568b
commit f3b2925416
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/notif_half_shelf_row.xml
View File

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

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

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