diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml index 200c6a5d6..9e1541834 100644 --- a/app/src/main/res/layout/device_itemv2.xml +++ b/app/src/main/res/layout/device_itemv2.xml @@ -68,7 +68,7 @@ android:id="@+id/device_battery_status" android:layout_width="match_parent" android:layout_height="36dp" - android:tint="?android:attr/textColor" + android:tint="@color/secondarytext" card_view:srcCompat="@drawable/level_list_battery" /> @@ -100,7 +100,7 @@ android:layout_height="36dp" android:clickable="true" android:contentDescription="@string/controlcenter_fetch_activity_data" - android:tint="?android:attr/textColor" + android:tint="@color/secondarytext" android:background="?android:attr/selectableItemBackground" card_view:srcCompat="@drawable/ic_action_fetch_activity_data" /> @@ -124,7 +124,7 @@ android:layout_toRightOf="@id/device_action_fetch_activity_box" android:clickable="true" android:contentDescription="@string/controlcenter_take_screenshot" - android:tint="?android:attr/textColor" + android:tint="@color/secondarytext" android:background="?android:attr/selectableItemBackground" card_view:srcCompat="@drawable/ic_screenshot" /> @@ -137,7 +137,7 @@ android:layout_toRightOf="@id/device_action_take_screenshot" android:clickable="true" android:contentDescription="@string/controlcenter_start_configure_alarms" - android:tint="?android:attr/textColor" + android:tint="@color/secondarytext" android:background="?android:attr/selectableItemBackground" card_view:srcCompat="@drawable/ic_device_set_alarms" /> @@ -149,7 +149,7 @@ android:layout_margin="8dp" android:layout_toRightOf="@id/device_action_set_alarms" android:clickable="true" - android:tint="?android:attr/textColor" + android:tint="@color/secondarytext" card_view:srcCompat="@drawable/ic_activity_graphs" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/controlcenter_start_activitymonitor" /> @@ -166,7 +166,7 @@ android:layout_marginTop="8dp" android:clickable="true" android:contentDescription="@string/candidate_item_device_image" - android:tint="?android:attr/textColor" + android:tint="@color/secondarytext" android:background="?android:attr/selectableItemBackground" card_view:srcCompat="@drawable/ic_more_vert" /> @@ -201,7 +201,7 @@ android:layout_marginRight="0dp" android:layout_marginTop="8dp" android:clickable="true" - android:tint="?android:attr/textColor" + android:tint="?android:textColorTertiary" android:background="?android:attr/selectableItemBackground" card_view:srcCompat="@drawable/ic_action_find_lost_device" android:contentDescription="@string/controlcenter_find_device" /> @@ -217,7 +217,7 @@ android:layout_marginRight="0dp" android:layout_marginTop="8dp" android:clickable="true" - android:tint="?android:attr/textColor" + android:tint="?android:textColorTertiary" android:background="?android:attr/selectableItemBackground" card_view:srcCompat="@drawable/ic_remove_device" android:contentDescription="@string/controlcenter_delete_device" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ac484db26..4c3a59cb6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,6 +10,8 @@ #000000 #ffffff #ff808080 + #ffd0d0d0 + #ff606060 #1f000000 #ffab40 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ce4a372d6..a51b5fdf5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -5,6 +5,7 @@ @color/secondarytext @color/primary_light @color/primarydark_light + @color/tertiarytext_light @color/accent @@ -26,6 +27,7 @@ @color/secondarytext @color/primary_dark @color/primarydark_dark + @color/tertiarytext_dark @color/accent