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

Control UI - Mop, vacuum, unknown

Browse Source 
Add a better unknown icon. Map mop + vacuum to the vacuum icon for now

Bug: 148207527
Test: atest SystemUITests
Change-Id: Id7872f7af8708bb8cfcdba5fb6e7d2d677cb08cf
This commit is contained in:
Matt Pietal
2020-02-05 11:59:00 -05:00
parent a7db3c8e79
commit fee8c47919
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/res/drawable/ic_device_unknown_gm2_24px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M12,2l-5.5,9h11L12,2zM12,5.84L13.93,9h-3.87L12,5.84zM17.5,13c-2.49,0 -4.5,2.01 -4.5,4.5s2.01,4.5 4.5,4.5 4.5,-2.01 4.5,-4.5 -2.01,-4.5 -4.5,-4.5zM17.5,20c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5zM3,21.5h8v-8L3,13.5v8zM5,15.5h4v4L5,19.5v-4z"/>
</vector>

12
packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt
View File

@@ -108,10 +108,18 @@ private val deviceIconMap = mapOf<Int, IconState>(
DeviceTypes.TYPE_OUTLET to IconState(
R.drawable.ic_power_off_gm2_24px,
R.drawable.ic_power_gm2_24px
),
DeviceTypes.TYPE_VACUUM to IconState(
R.drawable.ic_vacuum_gm2_24px,
R.drawable.ic_vacuum_gm2_24px
),
DeviceTypes.TYPE_MOP to IconState(
R.drawable.ic_vacuum_gm2_24px,
R.drawable.ic_vacuum_gm2_24px
)
).withDefault {
IconState(
R.drawable.ic_light_off_gm2_24px,
R.drawable.ic_lightbulb_outline_gm2_24px
R.drawable.ic_device_unknown_gm2_24px,
R.drawable.ic_device_unknown_gm2_24px
)
}