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

Commit 7965fa41 authored by Ajay Nambi's avatar Ajay Nambi Committed by Robert Greenwalt
Browse files

Add support for LTE CarrierAgregation 

Note this may be redesigned in O to better handle the
various bitrate/channel combinations in a sane way.

bug:27360321
Change-Id: If6ffbd02e3a7f170cc041747e32bb624234c3e09
parent d4ac4c77

packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

    

     http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:width="18.0dp"

    android:height="24dp"

    android:viewportWidth="36.0"

    android:viewportHeight="36.0">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M6.797,13.334h1.231v1.522H6.797v2.509h-1.62v-2.509H1.101l-0.039-1.157l4.069-7.643h1.666V13.334z

M2.648,13.334h2.53V8.721L5.137,8.713L4.984,9.148L2.648,13.334z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M16.155,15.836c-0.269,0.439-0.695,0.832-1.282,1.177c-0.587,0.344-1.344,0.517-2.271,0.517

c-1.151,0-2.098-0.432-2.841-1.294c-0.744-0.862-1.115-1.978-1.115-3.345v-2.36c0-1.367,0.359-2.481,1.077-3.343

c0.719-0.863,1.643-1.293,2.772-1.293c1.132,0,2.017,0.331,2.649,0.994c0.633,0.663,0.941,1.528,0.924,2.594l-0.021,0.047h-1.545

c0-0.638-0.171-1.15-0.513-1.538c-0.341-0.389-0.831-0.583-1.469-0.583c-0.674,0-1.217,0.292-1.63,0.877

c-0.413,0.585-0.619,1.328-0.619,2.229v2.375c0,0.912,0.215,1.662,0.645,2.25c0.431,0.587,0.992,0.881,1.684,0.881

c0.522,0,0.935-0.068,1.238-0.205c0.304-0.138,0.533-0.305,0.688-0.502v-2.338h-2.041v-1.413h3.668V15.836z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M19.366,14.701v-2.232h-2.25v-1.541h2.25V8.695h1.5v2.232h2.256v1.541h-2.256v2.232H19.366z" />

</vector>

packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g_plus.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



     http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:width="15dp"

    android:height="20dp"

    android:viewportWidth="36"

    android:viewportHeight="36">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M6.797,13.334h1.231v1.522H6.797v2.509h-1.62v-2.509H1.101l-0.039-1.157l4.069-7.643h1.666V13.334z

M2.648,13.334h2.53V8.721L5.137,8.713L4.984,9.148L2.648,13.334z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M16.155,15.836c-0.269,0.439-0.695,0.832-1.282,1.177c-0.587,0.344-1.344,0.517-2.271,0.517

c-1.151,0-2.098-0.432-2.841-1.294c-0.744-0.862-1.115-1.978-1.115-3.345v-2.36c0-1.367,0.359-2.481,1.077-3.343

c0.719-0.863,1.643-1.293,2.772-1.293c1.132,0,2.017,0.331,2.649,0.994c0.633,0.663,0.941,1.528,0.924,2.594l-0.021,0.047h-1.545

c0-0.638-0.171-1.15-0.513-1.538c-0.341-0.389-0.831-0.583-1.469-0.583c-0.674,0-1.217,0.292-1.63,0.877

c-0.413,0.585-0.619,1.328-0.619,2.229v2.375c0,0.912,0.215,1.662,0.645,2.25c0.431,0.587,0.992,0.881,1.684,0.881

c0.522,0,0.935-0.068,1.238-0.205c0.304-0.138,0.533-0.305,0.688-0.502v-2.338h-2.041v-1.413h3.668V15.836z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M19.366,14.701v-2.232h-2.25v-1.541h2.25V8.695h1.5v2.232h2.256v1.541h-2.256v2.232H19.366z" />

</vector>

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -348,6 +348,9 @@ 
    <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_data_connection_4g">4G</string>



    <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_data_connection_4g_plus">4G+</string>



    <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_data_connection_lte">LTE</string>

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

+3 −0
Original line number Diff line number Diff line
@@ -197,8 +197,11 @@ public class MobileSignalController extends SignalController< 


        if (mConfig.show4gForLte) {

            mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE, TelephonyIcons.FOUR_G);

            mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,

                TelephonyIcons.FOUR_G_PLUS);

        } else {

            mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE, TelephonyIcons.LTE);

            mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA, TelephonyIcons.LTE);

        }

        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_IWLAN, TelephonyIcons.WFC);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                            datatype.equals("1x") ? TelephonyIcons.ONE_X :

                            datatype.equals("3g") ? TelephonyIcons.THREE_G :

                            datatype.equals("4g") ? TelephonyIcons.FOUR_G :

                            datatype.equals("4g+") ? TelephonyIcons.FOUR_G_PLUS :

                            datatype.equals("e") ? TelephonyIcons.E :

                            datatype.equals("g") ? TelephonyIcons.G :

                            datatype.equals("h") ? TelephonyIcons.H :