Merge "[Device Controls] Fix the tooltip text color." into sc-dev am: b70feab0d8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531563

Change-Id: I0b5b7318a3b50fa4c51f455b053356976708e8f9
This commit is contained in:
Caitlin Cassidy
2021-05-13 20:41:10 +00:00
committed by Automerger Merge Worker

View File

@@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:textColor="?attr/wallpaperTextColor"
android:textColor="?android:attr/colorPrimary"
android:textSize="16sp"/>
<ImageView
android:id="@+id/dismiss"
@@ -58,7 +58,7 @@
android:layout_marginEnd="2dp"
android:alpha="0.7"
android:src="@drawable/ic_close_white"
android:tint="?attr/wallpaperTextColor"
android:tint="?android:attr/colorPrimary"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/accessibility_desc_close"/>
</LinearLayout>