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

Commit ff65a02f authored by ykhung's avatar ykhung Committed by YK Hung
Browse files

Update battery tip main icon into materiel theme design 

Update all battery tip icon into materiel theme design based on the UX
feedback and clean up legacy icons

Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I82f5b140700a36b29844c0c3330b2eeeda8e5a55
parent 85e51741

res/drawable/ic_perm_device_information_red_24dp.xml→res/drawable/ic_battery_alert_theme.xml

+7 −12
Original line number Original line Diff line number Diff line 
<!--

<!--

    Copyright (C) 2017 The Android Open Source Project

Copyright (C) 2023 The Android Open Source Project





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

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

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

    you may not use this file except in compliance with the License.
@@ -13,20 +13,15 @@ 
    See the License for the specific language governing permissions and

    See the License for the specific language governing permissions and

    limitations under the License.

    limitations under the License.

-->

-->



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

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

        android:width="24dp"

        android:width="24dp"

        android:height="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:viewportHeight="24.0">

        android:tint="?android:attr/colorError">

    <path

        android:fillColor="#FF000000"

        android:pathData="M11,7h2v2h-2z"/>

    <path

    <path

        android:fillColor="#FF000000"

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M11,11h2v6h-2z"/>

        android:pathData="M13,17h-2v-2h2V17zM13,13h-2V8h2V13z"/>

    <path

    <path

        android:fillColor="#FF000000"

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>

        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>

</vector>
 
</vector>

res/drawable/ic_battery_status_good_theme.xml

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

Copyright (C) 2023 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="?android:attr/colorAccent"

        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>

    <path

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M16.1,11.1l-1.4,-1.5l-3.9,3.9l-1.5,-1.4l-1.4,1.4l2.9,2.9z"/>

</vector>

res/drawable/ic_perm_device_information_green_24dp.xml→res/drawable/ic_perm_device_information_theme.xml

+4 −5
Original line number Original line Diff line number Diff line 
<!--

<!--

    Copyright (C) 2018 The Android Open Source Project

    Copyright (C) 2023 The Android Open Source Project





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

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

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

    you may not use this file except in compliance with the License.
@@ -13,19 +13,18 @@ 
    See the License for the specific language governing permissions and

    See the License for the specific language governing permissions and

    limitations under the License.

    limitations under the License.

-->

-->



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

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

        android:width="24dp"

        android:width="24dp"

        android:height="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0">

    <path

    <path

        android:fillColor="#0F9D58"

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M11,7h2v2h-2z"/>

        android:pathData="M11,7h2v2h-2z"/>

    <path

    <path

        android:fillColor="#0F9D58"

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M11,11h2v6h-2z"/>

        android:pathData="M11,11h2v6h-2z"/>

    <path

    <path

        android:fillColor="#0F9D58"

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>

        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>

</vector>
 
</vector>

src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ public class BatteryDefenderTip extends BatteryTip { 




    @Override

    @Override

    public int getIconId() {

    public int getIconId() {

        return R.drawable.ic_battery_status_good_24dp;

        return R.drawable.ic_battery_status_good_theme;

    }

    }





    @Override

    @Override

src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ public class HighUsageTip extends BatteryTip { 




    @Override

    @Override

    public int getIconId() {

    public int getIconId() {

        return R.drawable.ic_perm_device_information_red_24dp;

        return R.drawable.ic_perm_device_information_theme;

    }

    }





    @Override

    @Override