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

Commit ab19293c authored by Jyun LuoLai's avatar Jyun LuoLai Committed by Android (Google) Code Review
Browse files

Merge "Let battery status icon has consist UI in PowerSummaryPage" into pi-dev

parents 1873faef dbcc3d41

res/drawable/ic_battery_status_bad_24dp.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2018 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="?attr/batteryBadColor"

        android:pathData="M15.78,4h-1.72V2h-4.04v2H8.31C7.61,4,7,4.6,7,5.3v15.3C7,21.4,7.61,22,8.31,22h7.37c0.71,0,1.31-0.6,1.31-1.3V5.3

		C17.09,4.6,16.48,4,15.78,4z M15,14h-2v2h-2v-2H9v-2h2v-2h2v2h2V14z"/>

</vector>

res/drawable/ic_battery_status_good_24dp.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2018 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="?attr/batteryGoodColor"

        android:pathData="M15.78,4h-1.72V2h-4.04v2H8.31C7.61,4,7,4.6,7,5.3v15.3C7,21.4,7.61,22,8.31,22h7.37c0.71,0,1.31-0.6,1.31-1.3V5.3

		C17.09,4.6,16.48,4,15.78,4z M10.94,16.37l-3.18-3.18l1.42-1.42l1.77,1.76l3.9-3.9l1.42,1.42L10.94,16.37z"/>

</vector>

res/drawable/ic_battery_status_maybe_24dp.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2018 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="?attr/batteryMaybeColor"

        android:pathData="M15.78,4h-1.72V2h-4.04v2H8.31C7.61,4,7,4.6,7,5.3v15.3C7,21.4,7.61,22,8.31,22h7.37c0.71,0,1.31-0.6,1.31-1.3V5.3

		C17.09,4.6,16.48,4,15.78,4z M13,17.5h-2v-2h2V17.5z M13,13.5h-2v-5h2V13.5z"/>

</vector>

res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -174,4 +174,9 @@ 
    </declare-styleable>



    <attr name="twoStateButtonPreferenceStyle" format="reference" />



    <attr name="batteryGoodColor" format="color" />

    <attr name="batteryBadColor" format="color" />

    <attr name="batteryMaybeColor" format="color" />



</resources>

res/values/colors.xml

+7 −0
Original line number Diff line number Diff line
@@ -130,5 +130,12 @@ 


    <color name="glif_error_color">@*android:color/material_red_A700</color>



    <color name="battery_good_color_light">#43a047</color> <!-- Material Green 600 -->

    <color name="battery_maybe_color_light">#ef6c00</color> <!-- Material Orange 800 -->

    <color name="battery_bad_color_light">#f44336</color> <!-- Material Red 500 -->

    <color name="battery_good_color_dark">#4caf50</color> <!-- Material Green 500 -->

    <color name="battery_maybe_color_dark">#fdd835</color> <!-- Material Yellow 600 -->

    <color name="battery_bad_color_dark">#f44336</color> <!-- Material Red 500 -->



</resources>