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

Merge "Fix long screenshot text contrast in dark mode." into sc-dev am: 113886ccae

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

Change-Id: I921f1b64323790bf352a67c8382e95500aeec92e
This commit is contained in:
Matt Casey
2021-05-22 13:12:28 +00:00
committed by Automerger Merge Worker
parent 976edfdbf2 113886ccae
commit 00d0301b83
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/long_screenshot.xml
View File

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

1
packages/SystemUI/res/values-night/styles.xml
View File

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