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

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

Merge branch '2100-t-revert_volte' into 'v1-t' 

Remove VoLTE in statusbar

See merge request e/os/android_frameworks_base!199
parents 315e5a5c 2c050556

core/res/res/values/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
        <item><xliff:g id="id">@string/status_bar_ethernet</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_wifi</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_hotspot</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_ims</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_mobile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_airplane</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_battery</xliff:g></item>
@@ -91,7 +90,6 @@ 
    <string translatable="false" name="status_bar_alarm_clock">alarm_clock</string>

    <string translatable="false" name="status_bar_secure">secure</string>

    <string translatable="false" name="status_bar_clock">clock</string>

    <string translatable="false" name="status_bar_ims">ims</string>

    <string translatable="false" name="status_bar_mobile">mobile</string>

    <string translatable="false" name="status_bar_vpn">vpn</string>

    <string translatable="false" name="status_bar_ethernet">ethernet</string>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -3145,7 +3145,6 @@ 
  <java-symbol type="string" name="status_bar_airplane" />

  <java-symbol type="string" name="status_bar_no_calling" />

  <java-symbol type="string" name="status_bar_call_strength" />

  <java-symbol type="string" name="status_bar_ims" />

  <java-symbol type="string" name="status_bar_mobile" />

  <java-symbol type="string" name="status_bar_ethernet" />

  <java-symbol type="string" name="status_bar_vpn" />

packages/SystemUI/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -182,10 +182,6 @@ android_library { 
    manifest: "AndroidManifest.xml",

    additional_manifests: ["LineageManifest.xml"],



    libs: [

        "ims-common",

    ],



    kotlincflags: ["-Xjvm-default=enable"],



    plugins: ["dagger2-compiler"],
@@ -347,7 +343,6 @@ android_library { 
        "android.test.runner",

        "android.test.base",

        "android.test.mock",

        "ims-common",

    ],

    kotlincflags: ["-Xjvm-default=enable"],

    aaptflags: [
@@ -462,10 +457,6 @@ android_app { 
    certificate: "platform",

    privileged: true,



    libs: [

        "ims-common",

    ],



    kotlincflags: ["-Xjvm-default=enable"],



    dxflags: ["--multi-dex"],

packages/SystemUI/res/drawable/ic_volte.xml

deleted100644 → 0
+0 −40
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="16"

    android:viewportHeight="13"

    android:tint="#FFFFFF">

    <group android:scaleX="0.6725146"

        android:scaleY="0.54641813"

        android:translateX="2.619883"

        android:translateY="2.9482822">

        <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"/>

        <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>

</vector>

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>