Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00d0301b authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I921f1b64323790bf352a67c8382e95500aeec92e
parents 976edfdb 113886cc

packages/SystemUI/res/layout/long_screenshot.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:layout_marginStart="8dp"

        android:layout_marginTop="4dp"

        android:backgroundTint="?androidprv:attr/colorAccentSecondary"

        android:textColor="?androidprv:attr/textColorSecondary"

        android:textColor="?android:textColorPrimary"

        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="?androidprv:attr/textColorSecondary"

        android:tint="?android:textColorPrimary"

        android:padding="16dp"

        android:scaleType="fitCenter"

        app:layout_constraintBottom_toBottomOf="parent"

packages/SystemUI/res/values-night/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +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>

    </style>



    <style name="Screenshot" parent="@android:style/Theme.DeviceDefault.DayNight">