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

Commit 3588b515 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19711303



Change-Id: I137233586abf15929227f3795ef061699a7335e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3852ceab adf79eae

res/drawable/ic_cellular_1_bar.xml

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

  Copyright (C) 2019 The Android Open Source Project

  Copyright (C) 2022 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.
@@ -19,11 +19,11 @@ 
    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

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

    android:tint="@color/battery_usage_system_icon_color">

    <path

        android:fillColor="#000000"

        android:fillColor="@android:color/white"

        android:pathData="M20,7v13H7L20,7 M22,2L2,22h20V2L22,2z" />

    <path

        android:fillColor="#000000"

        android:fillColor="@android:color/white"

        android:pathData="M 11 13 L 2 22 L 11 22 Z" />

</vector>

res/drawable/ic_power_system.xml

+3 −3
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2019 The Android Open Source Project

    Copyright (C) 2022 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.
@@ -19,8 +19,8 @@ 
        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

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

        android:tint="@color/battery_usage_system_icon_color">

    <path

        android:fillColor="#000000"

        android:fillColor="@android:color/white"

        android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>

</vector>

res/drawable/ic_settings_aod.xml

+10 −10
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2018 The Android Open Source Project

  Copyright (C) 2022 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.
@@ -19,16 +19,16 @@ 
        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

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

        android:tint="@color/battery_usage_system_icon_color">



    <path

        android:fillColor="#000000"

        android:fillColor="@android:color/white"

        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.01z M17,21H7l0-1h10V21z M17,18H7V6h10V18z M17,4H7V3h10V4z"/>

    <path

        android:fillColor="#000000"

        android:fillColor="@android:color/white"

        android:pathData="M 8 10 H 16 V 11.5 H 8 V 10 Z"/>

    <path

        android:fillColor="#000000"

        android:fillColor="@android:color/white"

        android:pathData="M 9 13 H 15 V 14.5 H 9 V 13 Z"/>

    <path

        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z"/>

res/drawable/ic_settings_bluetooth.xml

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

    Copyright (C) 2022 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"

        android:tint="@color/battery_usage_system_icon_color">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>

</vector>

res/drawable/ic_settings_camera.xml

+3 −3
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2015 The Android Open Source Project

     Copyright (C) 2022 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.
@@ -21,9 +21,9 @@ 
    android:viewportWidth="48"

    android:viewportHeight="48"

    android:autoMirrored="true"

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

    android:tint="@color/battery_usage_system_icon_color">



    <path android:fillColor="#000000"

    <path android:fillColor="@android:color/white"

          android:pathData="M18.8 21l9.53-16.51C26.94 4.18 25.49 4 24 4c-4.8 0-9.19 1.69-12.64

                            4.51l7.33 12.69.11-.2zm24.28-3c-1.84-5.85-6.3-10.52-11.99-12.68L23.77

                            18h19.31zm.52 2H28.62l.58 1 9.53 16.5C41.99 33.94 44 29.21 44