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

Commit ba9ada25 authored by Chaitanya Saggurthi's avatar Chaitanya Saggurthi Committed by Gerrit - the friendly Code Review server
Browse files

Add support for LTE, LTE+ data icons display. 

LTE/LTE+ data icons must be displayed on signal bar
when PS is registered to LTE/LTE_CA RATs as per
operator requirement.

Change-Id: I60b8e50c92d06c0d847df501178add070b98273b
CRs-Fixed: 957277, 957403
parent ecf7fd34

packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml

+3 −3
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

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

    android:width="30dp"

    android:height="27dp"

    android:height="14dp"

    android:viewportHeight="24.0"

    android:viewportWidth="30"

    android:viewportHeight="27" >

    android:width="15dp" >



    <path

        android:fillColor="#FFFFFF"

packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte.xml

+4 −4
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ Copyright (C) 2014 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="9.208dp"

    android:height="17dp"

    android:viewportHeight="24.0"

    android:viewportWidth="13.0"

        android:viewportHeight="24.0">

    android:width="8dp" >

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

packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte_plus.xml

+4 −4
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

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

    android:width="30dp"

    android:height="27dp"

    android:viewportWidth="30"

    android:viewportHeight="27">

      android:width="16.5dp"

      android:height="12dp"

      android:viewportWidth="45"

      android:viewportHeight="24.0">



    <path

        android:fillColor="#FFFFFF"

packages/SystemUI/res/values/arrays.xml

+5 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        <!--NETWORK_TYPE_EVDO_B-->

        <item>drawable/stat_sys_data_fully_connected_3g</item>

        <!--NETWORK_TYPE_LTE-->

        <item>drawable/stat_sys_data_fully_connected_3g</item>

        <item>drawable/stat_sys_data_fully_connected_lte</item>

        <!--NETWORK_TYPE_EHRPD-->

        <item>drawable/stat_sys_data_fully_connected_3g</item>

        <!--NETWORK_TYPE_HSPAP-->
@@ -104,6 +104,8 @@ 
        <item>drawable/stat_sys_data_fully_connected_3g</item>

        <!--NETWORK_TYPE_IWLAN-->

        <item>0</item>

        <!--NETWORK_TYPE_LTE_CA-->

        <item>drawable/stat_sys_data_fully_connected_lte_plus</item>

    </string-array>



    <!--reserved for overlay-->
@@ -163,6 +165,8 @@ 
        <item>string/accessibility_data_connection_3g</item>

        <!--NETWORK_TYPE_IWLAN-->

        <item>0</item>

        <!--NETWORK_TYPE_LTE_CA-->

        <item>string/accessibility_data_connection_lte_plus</item>

    </string-array>



    <string-array name="telephony_data_type_generation_description">

packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java

+12 −8
Original line number Diff line number Diff line
@@ -516,7 +516,18 @@ class TelephonyIcons { 
                break;

            case TelephonyManager.NETWORK_TYPE_LTE:

            case TelephonyManager.NETWORK_TYPE_LTE_CA:

                if (show4GforLte) {

                if (!show4GforLte || MobileSignalController.isCarrierOneSupported()) {

                    mSelectedDataActivityIndex[slot] = DATA_TYPE_LTE;

                    mSelectedDataTypeIcon[slot] = mRes.getIdentifier(

                            dataTypeArray[type], null, NS);

                    if ( type == TelephonyManager.NETWORK_TYPE_LTE_CA) {

                        mSelectedQSDataTypeIcon[slot] = QS_DATA_LTE_PLUS;

                    } else {

                        mSelectedQSDataTypeIcon[slot] = QS_DATA_LTE;

                    }

                    mSelectedDataTypeDesc[slot] = mDataTypeDescriptionArray[type];

                    mSelectedSignalStreagthIndex[slot] = SIGNAL_STRENGTH_TYPE_4G;

                } else {

                    mSelectedDataActivityIndex[slot] = DATA_TYPE_4G;

                    mSelectedDataTypeIcon[slot] = mRes.getIdentifier(

                        mDataTypeGenerationArray[1], null, NS);
@@ -528,13 +539,6 @@ class TelephonyIcons { 
                    mSelectedQSDataTypeIcon[slot] = QS_DATA_4G;

                    mSelectedDataTypeDesc[slot] = mDataTypeGenerationDescArray[1];

                    mSelectedSignalStreagthIndex[slot] = SIGNAL_STRENGTH_TYPE_4G;

                } else {

                    mSelectedDataActivityIndex[slot] = DATA_TYPE_LTE;

                    mSelectedDataTypeIcon[slot] = mRes.getIdentifier(

                            dataTypeArray[type], null, NS);

                    mSelectedQSDataTypeIcon[slot] = QS_DATA_LTE;

                    mSelectedDataTypeDesc[slot] = mDataTypeDescriptionArray[type];

                    mSelectedSignalStreagthIndex[slot] = SIGNAL_STRENGTH_TYPE_4G;

                }

                break;

            case TelephonyManager.NETWORK_TYPE_GPRS: