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

Commit 03fdbbe5 authored by mxyyiyi's avatar mxyyiyi
Browse files

Use material color res from settingslib for battery tips card 

Settings Anomaly Card
[Before-Dark] 	https://screenshot.googleplex.com/5PZC6mbWjqunvuv
[Before-Light] 	https://screenshot.googleplex.com/7eoF6yLX6t3JeHz
[After-Dark]  	https://screenshot.googleplex.com/5j4mQFDXjkVcxHs
[After-Light] 	https://screenshot.googleplex.com/5ySzfzft9293GXb

App Anomaly Card
[Before-Dark] 	https://screenshot.googleplex.com/JKkcqCiAKxkPZds
[Before-Light] 	https://screenshot.googleplex.com/ASB4CnDhPjsQohH
[After-Dark]  	https://screenshot.googleplex.com/5y3LVvng54vndi9
[After-Light] 	https://screenshot.googleplex.com/NCJeuViCtDcNhiV

Bug: 339130556
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I29d68713c14068fd9961082a148dd02ad38289a6
parent 4d725d77

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