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

Commit 6c790377 authored by SagarMakhar's avatar SagarMakhar Committed by Mohammed Althaf T
Browse files

SystemUI: Introduce VoLTE icon 



@neobuddy89: Clean up unrequired derps. Adapted for A13 QPR2.

Co-authored-by: default avatarAdithya R <gh0strider.2k18.reborn@gmail.com>
Co-authored-by: default avatarJyotiraditya Panda <jyotiraditya@aospa.co>
Co-authored-by: default avatarPranav Vashi <neobuddy89@gmail.com>
Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>

Improvements for dynamic VoLTE & VoWiFi icons

Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>

MobileSignalController: Try register IMS callback when listening

* Code taken from CAF with ProviderModel
* This should be addition to IMS state call back onAvailable().
* Remove ACTION_ENHANCE_4G_SWITCH, we do not have CAF stack to support this.

Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>

SystemUI: Update IMS states and update icon when necessary

Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>

* Fixes https://github.com/crdroidandroid/issue_tracker/issues/65



MobileSignalController: Remove unused volte leftover

Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>

fix

remove vowifi option
parent 3dcf599d

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
        <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>
@@ -90,6 +91,7 @@ 
    <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

+1 −0
Original line number Diff line number Diff line
@@ -3145,6 +3145,7 @@ 
  <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

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

    additional_manifests: ["LineageManifest.xml"],



    libs: [

        "ims-common",

    ],



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



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

        "android.test.base",

        "android.test.mock",

        "ims-common",

    ],

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

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

    privileged: true,



    libs: [

        "ims-common",

    ],



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



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

packages/SystemUI/res/drawable/ic_statusbar_volte.xml

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

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

    android:insetTop="0.5dp"

    android:insetBottom="0.5dp"

    android:insetLeft="2dp"

    android:insetRight="2dp">

    <vector

        android:width="23.375dp"

        android:height="16.5dp"

        android:viewportWidth="34"

        android:viewportHeight="24"

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

        <path

            android:fillColor="#ffffffff"

            android:fillType="evenOdd"

            android:pathData="M30,2C31.1046,2 32,2.8954 32,4L32,20C32,21.1046 31.1046,22 30,22L4,22C2.8954,22 2,21.1046 2,20L2,4C2,2.8954 2.8954,2 4,2L30,2ZM5.1853,13L3,13L4.6846,21L6.6043,21L7.528,17.2661L8.4593,21L10.3787,21L12.0583,13L9.8779,13L9.2396,16.7405L8.3403,13L6.7179,13L5.8234,16.7433L5.1853,13ZM15.1495,15.8115L13.1366,15.8115L13.1366,21L15.1495,21L15.1495,15.8115ZM21.1165,13L16.0842,13L16.0842,21L18.2006,21L18.2006,18.0308L20.6481,18.0308L20.6481,16.0908L18.2006,16.0908L18.2006,14.94L21.1165,14.94L21.1165,13ZM24,15.8115L21.9871,15.8115L21.9871,21L24,21L24,15.8115ZM29.0586,6.9033L25.3057,7.2861L25.3057,8.7695L27.124,8.7217L27.124,17L29.0586,17L29.0586,6.9033ZM15.1495,13.0957L13.1366,13.0957L13.1366,14.6522L15.1495,14.6522L15.1495,13.0957ZM24,13.0957L21.9871,13.0957L21.9871,14.6522L24,14.6522L24,13.0957ZM12.8537,5.386C11.9685,5.386 11.26,5.6684 10.7507,6.2349C10.2951,6.7417 10.0475,7.3818 10.0062,8.1441L10,8.3764L10,8.4789C10,9.3475 10.2496,10.0672 10.7511,10.6232C11.2605,11.188 11.9721,11.4694 12.8635,11.4694C13.7453,11.4694 14.452,11.1878 14.9612,10.6232C15.4172,10.1178 15.6648,9.477 15.7061,8.7121L15.7123,8.4789L15.7123,8.3764C15.7123,7.5112 15.4628,6.7924 14.9616,6.2349C14.4522,5.6684 13.7421,5.386 12.8537,5.386ZM5.3658,3.386L3,3.386L5.4886,11.0953L7.7073,11.0953L10.2065,3.386L7.836,3.386L6.5946,7.9606L5.3658,3.386ZM12.8537,6.9555C13.1825,6.9555 13.4169,7.0849 13.5568,7.3437C13.6735,7.5593 13.7415,7.8343 13.761,8.1687L13.7668,8.3764L13.7668,8.4789C13.7668,8.9184 13.6968,9.2651 13.5568,9.519C13.4169,9.7729 13.1857,9.8998 12.8635,9.8998C12.5314,9.8998 12.2963,9.7737 12.1579,9.5214C12.0393,9.3052 11.9716,9.019 11.9546,8.6628L11.9504,8.4789L11.9504,8.3764C11.9504,7.95 12.0196,7.6065 12.1579,7.3461C12.2963,7.0857 12.5282,6.9555 12.8537,6.9555ZM15.9726,4.976C15.7035,5.1694 15.6422,5.5444 15.8357,5.8134C16.2742,6.4232 16.5284,7.1502 16.5664,7.9005C16.5832,8.2315 16.865,8.4862 17.196,8.4694C17.5269,8.4526 17.7816,8.1708 17.7649,7.8398C17.7152,6.8594 17.3833,5.9102 16.81,5.1128C16.6165,4.8438 16.2416,4.7825 15.9726,4.976ZM17.7566,3.3465C17.4509,3.5832 17.3949,4.0228 17.6316,4.3285C18.3309,5.2319 18.7494,6.3272 18.8326,7.4668C18.8608,7.8523 19.1962,8.1421 19.5818,8.1139C19.9674,8.0857 20.2571,7.7503 20.2289,7.3648C20.1256,5.951 19.6068,4.593 18.7386,3.4715C18.502,3.1658 18.0623,3.1099 17.7566,3.3465Z"

            android:strokeWidth="1" />

    </vector>

</inset>

packages/SystemUI/res/drawable/ic_volte.xml

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

<!--

 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:height="24dp"

        android:width="30.5dp"

        android:viewportWidth="30.57"

        android:viewportHeight="24.0">



    <path

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