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

Commit f348f875 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use material color res from settingslib for battery tips card" into main

parents 179a7204 03fdbbe5

res/color/color_accent_selector.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 
     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="?android:attr/colorAccent"/>

    <item android:color="@color/settingslib_materialColorPrimary"/>

</selector>

res/drawable/battery_hints_chip_bg.xml

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <solid android:color="?androidprv:attr/materialColorPrimaryContainer" />

    <solid android:color="@color/settingslib_materialColorPrimaryContainer" />

    <corners android:radius="@dimen/battery_hints_chip_corner_radius" />

</shape>
 
 No newline at end of file

res/drawable/battery_tips_all_rounded_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="@color/settingslib_dialog_background" />

    <solid android:color="@color/settingslib_materialColorSurfaceBright" />

    <corners android:radius="@dimen/battery_tips_card_corner_radius_normal" />

</shape>
 
 No newline at end of file

res/layout/battery_tips_card.xml

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

        android:textAlignment="viewStart"

        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"

        android:textColor="?android:attr/textColorPrimary" />

        android:textColor="@color/settingslib_materialColorOnSurface" />



    <LinearLayout

        android:layout_width="match_parent"
@@ -55,7 +55,7 @@ 
            android:paddingHorizontal="16dp"

            android:text="@string/battery_tips_card_action_button"

            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"

            android:textColor="@color/power_anomaly_primary_button_text_color"

            android:textColor="@color/settingslib_materialColorOnPrimary"

            app:backgroundTint="@color/color_accent_selector" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

res/layout/power_anomaly_hints.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ 
        android:paddingHorizontal="8dp"

        android:textAlignment="viewStart"

        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"

        android:textColor="?androidprv:attr/materialColorOnSurface"/>

        android:textColor="@color/settingslib_materialColorOnSurface"/>



</LinearLayout>
 
 No newline at end of file