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

Commit 4d2c14cb authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Revert "base: add 4G and LTE icons for VoLTE" 

This reverts commit 22494b20.
parent 9d7c11fe

packages/SystemUI/res/drawable/ic_volte.xml

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

<!--

  ~ Copyright ECORP SAS 2024

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

 Copyright (c) 2017, The Linux Foundation. All rights reserved.

 Redistribution and use in source and binary forms, with or without

 modification, are permitted provided that the following conditions are

 met:

        * Redistributions of source code must retain the above copyright

        notice, this list of conditions and the following disclaimer.

        * Redistributions in binary form must reproduce the above

        copyright notice, this list of conditions and the following

        disclaimer in the documentation and/or other materials provided

        with the distribution.

        * Neither the name of The Linux Foundation nor the names of its

        contributors may be used to endorse or promote products derived

        from this software without specific prior written permission.

 THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

 ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

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

    android:width="24dp"

        android:height="24dp"

    android:viewportWidth="16"

    android:viewportHeight="13"

    android:tint="#FFFFFF">

    <group android:scaleX="0.6725146"

        android:scaleY="0.54641813"

        android:translateX="2.619883"

        android:translateY="2.9482822">

        android:width="30.5dp"

        android:viewportWidth="30.57"

        android:viewportHeight="24.0">



    <path

            android:pathData="M2.251,8.999L6.057,8.559L7.877,10.379C9.921,9.339 11.597,7.67 12.637,5.619L10.81,3.792L11.25,0H15.23C15.649,7.352 9.603,13.398 2.251,12.979V8.999Z"

            android:fillColor="#ffffff"/>

        android:fillColor="#ffffffff"

        android:pathData="M10.62,13.14 A0.42,0.42,0,0,0,10.23,13.36 A1.29,1.29,0,0,0,10.23,14.47 A0.45,0.45,0,0,0,11.01,14.47 A1.29,1.29,0,0,0,11.01,13.36 A0.42,0.42,0,0,0,10.62,13.14 Z" />

    <path

            android:pathData="M3.147,3.831V4.451H1.297V3.831H3.147ZM1.493,0V4.451H0.75V0H1.493Z"

            android:fillColor="#ffffff"/>

        <path

            android:pathData="M4.629,0V4.451H3.889V0H4.629ZM5.763,0V0.624H2.768V0H5.763Z"

            android:fillColor="#ffffff"/>

        <path

            android:pathData="M8.83,3.831V4.451H6.898V3.831H8.83ZM7.093,0V4.451H6.35V0H7.093ZM8.57,1.853V2.464H6.898V1.853H8.57ZM8.811,0V0.624H6.898V0H8.811Z"

            android:fillColor="#ffffff"/>

    </group>

        android:fillColor="#ffffffff"

        android:pathData="M28.54,5.6 L2.06,5.6 A1.11,1.11,0,0,0,0.95,6.71 L0.95,18.24 A1.11,1.11,0,0,0,2.06,19.35 L28.54,19.35 A1.11,1.11,0,0,0,29.65,18.24 L29.65,6.71 A1.11,1.11,0,0,0,28.54,5.6 Z M5.31,15.6 L3.43,9.84 L4.94,9.84 L6.18,14.05 L7.42,9.84 L8.82,9.84 L6.94,15.59 L5.31,15.59 Z M12.19,14.85 A1.46,1.46,0,0,1,11.56,15.43 A2.11,2.11,0,0,1,10.61,15.63 A2.13,2.13,0,0,1,9.66,15.43 A1.45,1.45,0,0,1,9,14.83 A2,2,0,0,1,9,13 A1.45,1.45,0,0,1,9.63,12.42 A2.13,2.13,0,0,1,10.58,12.22 A2.11,2.11,0,0,1,11.53,12.42 A1.46,1.46,0,0,1,12.16,13 A2,2,0,0,1,12.2,14.83 Z M13.1,12.85 A0.4,0.4,0,0,1,12.57,12.65 A1.76,1.76,0,0,0,11.23,11.77 A0.4,0.4,0,0,1,10.87,11.33 A0.4,0.4,0,0,1,11.31,10.97 A2.57,2.57,0,0,1,13.31,12.32 A0.4,0.4,0,0,1,13.1,12.8 Z M14.29,11.93 A0.5,0.5,0,0,1,13.62,11.7 A2.66,2.66,0,0,0,11.51,10.37 A0.5,0.5,0,0,1,11.56,9.37 A3.66,3.66,0,0,1,14.56,11.26 A0.5,0.5,0,0,1,14.29,11.88 Z M18.56,15.6 L14.9,15.6 L14.9,9.81 L16.33,9.81 L16.33,14.39 L18.55,14.39 L18.55,15.55 Z M22.56,10.98 L21,10.98 L21,15.6 L19.58,15.6 L19.58,10.94 L18,10.94 L18,9.81 L22.54,9.81 L22.54,10.94 Z M27.16,15.6 L23.16,15.6 L23.16,9.81 L27.03,9.81 L27.03,10.92 L24.64,10.92 L24.64,12 L26.91,12 L26.91,13.13 L24.64,13.13 L24.64,14.4 L27.17,14.4 L27.17,15.55 Z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_volte_4g.xml

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright ECORP SAS 2024

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="14"

    android:viewportHeight="14"

    android:tint="#FFFFFF">

    <group android:scaleX="0.5927835"

        android:scaleY="0.5927835"

        android:translateX="2.8505154"

        android:translateY="2.8505154">

        <path

            android:pathData="M0.751,10L4.557,9.559L6.377,11.379C8.421,10.339 10.097,8.671 11.137,6.62L9.31,4.792L9.75,1H13.73C14.149,8.353 8.103,14.398 0.751,13.979V10Z"

            android:fillColor="#ffffff"/>

        <path

            android:pathData="M0.265,4.497V3.994L2.12,1.053H2.814V3.89H3.33V4.497H2.814V5.367H2.172V4.497H0.265ZM0.993,3.89H2.172V2.065H2.133L0.993,3.89Z"

            android:fillColor="#ffffff"/>

        <path

            android:pathData="M5.902,5.462C5.521,5.462 5.183,5.371 4.888,5.186C4.597,4.997 4.368,4.734 4.194,4.398C4.029,4.058 3.947,3.662 3.947,3.21C3.947,2.758 4.038,2.366 4.216,2.031C4.394,1.691 4.636,1.428 4.94,1.243C5.243,1.053 5.59,0.959 5.976,0.959C6.449,0.959 6.847,1.066 7.164,1.286C7.489,1.501 7.693,1.807 7.775,2.194L7.138,2.362C7.064,2.121 6.93,1.932 6.73,1.794C6.535,1.652 6.284,1.583 5.972,1.583C5.725,1.583 5.499,1.643 5.291,1.768C5.083,1.893 4.923,2.074 4.801,2.315C4.68,2.556 4.619,2.853 4.619,3.206C4.619,3.555 4.68,3.852 4.797,4.097C4.918,4.338 5.079,4.519 5.278,4.644C5.482,4.768 5.703,4.829 5.946,4.829C6.193,4.829 6.405,4.781 6.583,4.682C6.765,4.583 6.908,4.446 7.012,4.278C7.121,4.106 7.19,3.912 7.212,3.692H5.963V3.124H7.858C7.858,3.499 7.858,3.873 7.858,4.243C7.858,4.618 7.858,4.992 7.858,5.363H7.246V4.76H7.212C7.09,4.971 6.921,5.139 6.7,5.268C6.483,5.397 6.219,5.462 5.902,5.462Z"

            android:fillColor="#ffffff"/>

    </group>

</vector>

packages/SystemUI/res/drawable/ic_volte_no_voice.xml

0 → 100644
+50 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

 * met:

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above

 *    copyright notice, this list of conditions and the following

 *    disclaimer in the documentation and/or other materials provided

 *    with the distribution.

 *  * Neither the name of The Linux Foundation nor the names of its

 *    contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->



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

    android:width="14dp"

    android:height="17dp"

    android:viewportWidth="14"

    android:viewportHeight="17">



    <path

        android:pathData="M 1.2 4 H 13.7 V 13.2 H 1.2 V 4 Z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M1.9,12.6V4h0.8v3.5h3.2V4h0.8v8.6H5.9v-4H2.7v4H1.9z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M8,12.6V4h2.1c0.5,0,0.8,0,1.1,0.1c0.4,0.1,0.7,0.3,0.9,0.6c0.3,0.4,0.6,0.9,0.7,1.5s0.2,1.3,0.2,2c0,0.7-0.1,1.2-0.2,1.7c-0.1,0.5-0.2,0.9-0.4,1.3S12.2,11.8,12,12s-0.4,0.3-0.7,0.4s-0.6,0.1-1,0.1H8zM8.8,11.6h1.3c0.4,0,0.7-0.1,0.9-0.2c0.2-0.1,0.4-0.3,0.5-0.4c0.2-0.3,0.3-0.6,0.4-1.1c0.1-0.5,0.2-1,0.2-1.7c0-0.9-0.1-1.6-0.3-2.1c-0.2-0.5-0.5-0.8-0.8-1C11,5.1,10.6,5,10.1,5H8.8V11.6z" />

    <path

        android:fillColor="#000000"

        android:pathData="M 2 9 L 1 9 L 1 9 L 2 9 Z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M 0.5 9 H 13.5 V 10 H 0.5 V 9 Z" />

</vector>
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java

+1 −5
Original line number Diff line number Diff line
@@ -424,12 +424,8 @@ public class MobileSignalController extends SignalController<MobileState, Mobile 
        int resId = 0;



        if (isVolteAvailable()) {

            if (mConfig.show4gForLte) {

                resId = R.drawable.ic_volte_4g;

            } else {

            resId = R.drawable.ic_volte;

        }

        }

        return resId;

    }