Merge "Separate share icon color from button text." into sc-dev am: 06b87b84dc

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

Change-Id: I55bda0c21e86938c187a54999ad9508ca90e687c
This commit is contained in:
Matt Casey
2021-05-25 16:55:13 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 3 deletions

View File

@@ -33,7 +33,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:backgroundTint="?androidprv:attr/colorAccentSecondary"
android:textColor="?android:textColorPrimary"
android:textColor="?android:textColorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/preview" />
@@ -117,7 +117,7 @@
android:backgroundTint="?androidprv:attr/colorAccentSecondary"
android:src="@drawable/ic_screenshot_edit"
android:contentDescription="@string/screenshot_edit_label"
android:tint="?android:textColorPrimary"
android:tint="?android:textColorSecondary"
android:padding="16dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"

View File

@@ -35,7 +35,7 @@
<item name="android:windowLightStatusBar">false</item>
<item name="android:windowLightNavigationBar">false</item>
<item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item>
<item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item>
<item name="android:textColorSecondary">?android:attr/textColorPrimaryInverse</item>
</style>
<style name="Screenshot" parent="@android:style/Theme.DeviceDefault.DayNight">