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

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

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

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

Change-Id: I55bda0c21e86938c187a54999ad9508ca90e687c
parents 1302c4bd 06b87b84

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="?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"

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

+1 −1
Original line number Diff line number Diff line
@@ -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">