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

Commit f2370e00 authored by Nishanth Kumar Sirivolu's avatar Nishanth Kumar Sirivolu Committed by Linux Build Service Account
Browse files

Add EMBMS icon and roaming icon changes 

Add new roaming data icons
Add support for new roaming data icons display
for LTE, LTE+ for operator.
Change-Id: I080506527ec906af07b565ffc5e4b503283cd77e
CRs-Fixed: 957287

Add icon for EMBMS registration
LTE icon is appended to signal bar in status bar when
EMBMS service is active
CRs-Fixed: 957448
Change-Id: I010dee19228b50d72f0c43b36dfafe6e7c9865a9

Fix eMBMS icon display on eMBMS service stop
Fix delay in remove eMBMS icon on eMBMS service stop by
notifylistener
Change-Id: Ib7986f0428c6e817be649929b340cf66e7a1e8f8

During Roming "R" icon is removed from siganl bar when data is disabled.
During roaming display "R" icon irrespective of whether the data is enabled
or disabled.
And display LTE/LTE+ data icons on signal bar only if mobile data is enabled.
CRs-Fixed:981620
Change-Id: I4b1c0089215d575c7ad24ce68cc0dc003f895dc5

Fix data icon issue for roaming
In case of roaming network, if data roaming setting is disabled
data is disconnected, but operator data icon is not cleared.
Add a check for data roaming setting to clear operator data icon.
Change-Id: Ib87884f0d78e91dda219c887b7657cff8806890d
CRs-Fixed: 988136

Change-Id: Ie3de506d147ed3ecfe89a08cc2061732d406a10b
parent 9c9e9966

packages/SystemUI/res/drawable/lte_embms_services_all_brackets.xml

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

<!--

 Copyright (c) 2016, 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 android:autoMirrored="true" android:height="17dp"

    android:viewportHeight="25.0" android:viewportWidth="25.0"

    android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="#FFFFFF" android:pathData="M7.6,13.5h2.5v1H6.4V8.7h1.2V13.5z"/>

    <path android:fillColor="#FFFFFF" android:pathData="M14.4,9.6h-1.8v4.8h-1.2V9.6H9.7v-1h4.7V9.6z"/>

    <path android:fillColor="#FFFFFF" android:pathData="M18.5,11.9h-2.3v1.5h2.7v1H15V8.7h3.9v1h-2.7V11h2.3V11.9z"/>

    <path android:fillColor="#00000000"

        android:pathData="M2.7,16.1c-1.2,-1.2 -1.8,-2.7 -1.8,-4.4c0,-1.7 0.7,-3.2 1.9,-4.4"

        android:strokeColor="#FFFFFF" android:strokeLineCap="round" android:strokeWidth="1"/>

    <path android:fillColor="#00000000"

        android:pathData="M4.3,14.5c-0.7,-0.7 -1.2,-1.7 -1.2,-2.8c0,-1.1 0.5,-2.1 1.2,-2.9"

        android:strokeColor="#FFFFFF" android:strokeLineCap="round" android:strokeWidth="1"/>

    <path android:fillColor="#00000000"

        android:pathData="M22.3,16.1c1.2,-1.2 1.8,-2.7 1.8,-4.4c0,-1.7 -0.7,-3.2 -1.9,-4.4"

        android:strokeColor="#FFFFFF" android:strokeLineCap="round" android:strokeWidth="1"/>

    <path android:fillColor="#00000000"

        android:pathData="M20.7,14.5c0.7,-0.7 1.2,-1.7 1.2,-2.8c0,-1.1 -0.5,-2.1 -1.2,-2.9"

        android:strokeColor="#FFFFFF" android:strokeLineCap="round" android:strokeWidth="1"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte_networktype_in_roam.xml

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

<!--

Copyright (c) 2016, 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="9.208dp"

        android:height="17dp"

        android:viewportWidth="13.0"

        android:viewportHeight="24.0" >



    <path

       android:fillColor="#FFFFFFFF"

        android:pathData="M2.000000,9.700000l2.000000,0.000000L4.000000,11.000000L0.300000,11.000000L0.300000,2.500000L2.000000,2.500000L2.000000,9.700000z" />

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M8.300000,3.800000L7.000000,3.800000L7.000000,11.000000L5.300000,11.000000L5.300000,3.800000L4.000000,3.800000L4.000000,2.500000l4.300000,0.000000L8.300000,3.800000z" />

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12.400000,7.300000l-1.700000,0.000000l0.000000,2.400000l2.100000,0.000000L12.799999,11.000000L9.000000,11.000000L9.000000,2.500000l3.700000,0.000000l0.000000,1.300000l-2.100000,0.000000l0.000000,2.100000l1.700000,0.000000L12.300000,7.300000z" />



</vector>

packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte_plus_networktype_in_roam.xml

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

<!--

Copyright (c) 2016, 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="15dp"

    android:height="13.5dp"

    android:viewportWidth="30"

    android:viewportHeight="27">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M3.889,11.969h3.325v1.787h-5.22V3.092h1.895V11.969z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M13.064,4.887h-2.319v8.869H8.844V4.887h-2.28V3.092h6.501V4.887z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M18.999,9.143h-2.951v2.826h3.492v1.787h-5.387V3.092h5.374v1.795h-3.479v2.52h2.951V9.143z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M25.863,7.498h2.969v1.734h-2.969v3.383H24.02V9.232h-2.984V7.498h2.984V4.334h1.844V7.498z" />

</vector>

packages/SystemUI/res/layout/mobile_signal_group.xml

+16 −0
Original line number Diff line number Diff line
@@ -28,6 +28,22 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    >

    <ImageView

        android:id="@+id/embms"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="2dp"

        android:layout_marginEnd="4dp"

        android:visibility="gone"

        />

    <ImageView

        android:id="@+id/dataNetwork_type_in_roaming"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_gravity="start|bottom"

        android:layout_marginEnd="5dp"

        android:visibility="gone"

        />

    <ImageView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ 
        3: Show data activity with data type at the left side

           of signal icon, and do not show two stacked icon on

           one slot.

        4: Show LTE, LTE+ symbols on top of signal icon,

           and shows IMS and embms icons on the left side

           of the signal icon.

    -->

    <integer name="status_bar_style">0</integer>