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

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

Merge "Update the Call Strength icons to support 0~4 bars" into sc-dev am: 0fc7ecde 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae2c5171246aab4129b459bc48640cabdeac9598
parents 042a93d2 0fc7ecde

packages/SettingsLib/res/drawable/ic_mobile_call_strength_0.xml

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

     Copyright (C) 2021 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="#FF000000"

        android:pathData="M13.47,17.91l-2.18,-0.43c-0.22,-0.05 -0.45,0.03 -0.6,0.18L9.34,19C7.5,18.01 5.99,16.5 5,14.66l1.35,-1.35c0.16,-0.16 0.23,-0.39 0.18,-0.6l-0.43,-2.18C6.03,10.23 5.76,10 5.44,10H2.67C2.29,10 1.98,10.31 2,10.69c0.11,1.94 0.69,3.76 1.62,5.35c1.05,1.8 2.54,3.29 4.34,4.34c1.59,0.93 3.41,1.51 5.35,1.62c0.37,0.02 0.69,-0.29 0.69,-0.67v-2.77C14,18.24 13.78,17.97 13.47,17.91z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M22,2L9,15h13V2z"

        android:fillAlpha="0.3"/>

</vector>

packages/SettingsLib/res/drawable/ic_mobile_call_strength_1.xml

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

     Copyright (C) 2020 The Android Open Source Project

     Copyright (C) 2021 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.
@@ -20,16 +20,12 @@ 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M20.17,14.84l-3.26,-0.65c-0.33,-0.07 -0.67,0.04 -0.9,0.27l-2.62,2.62c-2.75,-1.49 -5.01,-3.75 -6.5,-6.5l2.62,-2.62c0.24,-0.24 0.34,-0.58 0.27,-0.9L9.13,3.8C9.04,3.34 8.63,3 8.15,3H4C3.44,3 2.97,3.47 3,4.03c0.17,2.91 1.04,5.63 2.43,8.01c1.57,2.69 3.81,4.93 6.5,6.5c2.38,1.39 5.1,2.26 8.01,2.43c0.56,0.03 1.03,-0.44 1.03,-1v-4.15C20.97,15.34 20.64,14.93 20.17,14.84z"/>

        android:pathData="M13.47,17.91l-2.18,-0.43c-0.22,-0.05 -0.45,0.03 -0.6,0.18L9.34,19C7.5,18.01 5.99,16.5 5,14.66l1.35,-1.35c0.16,-0.16 0.23,-0.39 0.18,-0.6l-0.43,-2.18C6.03,10.23 5.76,10 5.44,10H2.67C2.29,10 1.98,10.31 2,10.69c0.11,1.94 0.69,3.76 1.62,5.35c1.05,1.8 2.54,3.29 4.34,4.34c1.59,0.93 3.41,1.51 5.35,1.62c0.37,0.02 0.69,-0.29 0.69,-0.67v-2.77C14,18.24 13.78,17.97 13.47,17.91z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,8h2v3h-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M16.5,5h2v6h-2z"

        android:pathData="M22,2L9,15h13V2z"

        android:fillAlpha="0.3"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M20,3h2v8h-2z"

        android:fillAlpha="0.3"/>

        android:pathData="M14,10l-5,5h5V10z"/>

</vector>

packages/SettingsLib/res/drawable/ic_mobile_call_strength_2.xml

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

     Copyright (C) 2020 The Android Open Source Project

     Copyright (C) 2021 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.
@@ -20,15 +20,12 @@ 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M20.17,14.84l-3.26,-0.65c-0.33,-0.07 -0.67,0.04 -0.9,0.27l-2.62,2.62c-2.75,-1.49 -5.01,-3.75 -6.5,-6.5l2.62,-2.62c0.24,-0.24 0.34,-0.58 0.27,-0.9L9.13,3.8C9.04,3.34 8.63,3 8.15,3H4C3.44,3 2.97,3.47 3,4.03c0.17,2.91 1.04,5.63 2.43,8.01c1.57,2.69 3.81,4.93 6.5,6.5c2.38,1.39 5.1,2.26 8.01,2.43c0.56,0.03 1.03,-0.44 1.03,-1v-4.15C20.97,15.34 20.64,14.93 20.17,14.84z"/>

        android:pathData="M13.47,17.91l-2.18,-0.43c-0.22,-0.05 -0.45,0.03 -0.6,0.18L9.34,19C7.5,18.01 5.99,16.5 5,14.66l1.35,-1.35c0.16,-0.16 0.23,-0.39 0.18,-0.6l-0.43,-2.18C6.03,10.23 5.76,10 5.44,10H2.67C2.29,10 1.98,10.31 2,10.69c0.11,1.94 0.69,3.76 1.62,5.35c1.05,1.8 2.54,3.29 4.34,4.34c1.59,0.93 3.41,1.51 5.35,1.62c0.37,0.02 0.69,-0.29 0.69,-0.67v-2.77C14,18.24 13.78,17.97 13.47,17.91z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,8h2v3h-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M16.5,5h2v6h-2z"/>

        android:pathData="M22,2L9,15h13V2z"

        android:fillAlpha="0.3"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M20,3h2v8h-2z"

        android:fillAlpha="0.3"/>

        android:pathData="M18,6l-9,9h9V6z"/>

</vector>

packages/SettingsLib/res/drawable/ic_mobile_call_strength_3.xml

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

     Copyright (C) 2020 The Android Open Source Project

     Copyright (C) 2021 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.
@@ -20,14 +20,12 @@ 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M20.17,14.84l-3.26,-0.65c-0.33,-0.07 -0.67,0.04 -0.9,0.27l-2.62,2.62c-2.75,-1.49 -5.01,-3.75 -6.5,-6.5l2.62,-2.62c0.24,-0.24 0.34,-0.58 0.27,-0.9L9.13,3.8C9.04,3.34 8.63,3 8.15,3H4C3.44,3 2.97,3.47 3,4.03c0.17,2.91 1.04,5.63 2.43,8.01c1.57,2.69 3.81,4.93 6.5,6.5c2.38,1.39 5.1,2.26 8.01,2.43c0.56,0.03 1.03,-0.44 1.03,-1v-4.15C20.97,15.34 20.64,14.93 20.17,14.84z"/>

        android:pathData="M13.47,17.91l-2.18,-0.43c-0.22,-0.05 -0.45,0.03 -0.6,0.18L9.34,19C7.5,18.01 5.99,16.5 5,14.66l1.35,-1.35c0.16,-0.16 0.23,-0.39 0.18,-0.6l-0.43,-2.18C6.03,10.23 5.76,10 5.44,10H2.67C2.29,10 1.98,10.31 2,10.69c0.11,1.94 0.69,3.76 1.62,5.35c1.05,1.8 2.54,3.29 4.34,4.34c1.59,0.93 3.41,1.51 5.35,1.62c0.37,0.02 0.69,-0.29 0.69,-0.67v-2.77C14,18.24 13.78,17.97 13.47,17.91z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,8h2v3h-2z"/>

        android:pathData="M22,2L9,15h13V2z"

        android:fillAlpha="0.3"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M16.5,5h2v6h-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M20,3h2v8h-2z"/>

        android:pathData="M20,4L9,15h11V4z"/>

</vector>

packages/SettingsLib/res/drawable/ic_mobile_call_strength_4.xml

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

     Copyright (C) 2021 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="#FF000000"

        android:pathData="M22,2L9,15h13V2z"

        android:fillAlpha="0.3"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13.47,17.91l-2.18,-0.43c-0.22,-0.05 -0.45,0.03 -0.6,0.18L9.34,19C7.5,18.01 5.99,16.5 5,14.66l1.35,-1.35c0.16,-0.16 0.23,-0.39 0.18,-0.6l-0.43,-2.18C6.03,10.23 5.76,10 5.44,10H2.67C2.29,10 1.98,10.31 2,10.69c0.11,1.94 0.69,3.76 1.62,5.35c1.05,1.8 2.54,3.29 4.34,4.34c1.59,0.93 3.41,1.51 5.35,1.62c0.37,0.02 0.69,-0.29 0.69,-0.67v-2.77C14,18.24 13.78,17.97 13.47,17.91z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,15l13,0l0,-13z"/>

</vector>