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

Commit ecb5cdb1 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab Committed by Michael Bestas
Browse files

Status bar: Add HSPA+ icons 

Forward port H+ icon in the status bar when connected to HSPA+
Uses new vector drawables by blunden

Change-Id: Ia745c524d5e2530f50f12f961ea8533a4c8f5842
parent 02b98156

packages/SystemUI/res/drawable/ic_qs_signal_hp.xml

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

    Copyright (C) 2014 The CyanogenMod 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="16.4dp"

        android:height="32dp"

        android:viewportWidth="16.4"

        android:viewportHeight="32">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M8,14.667H5.867V10h-3.6v4.667H0V3.333h2.267v4.933h3.6V3.333H8V14.667Z" />

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M16.4,5.6h-2.267V3.333H12V5.6H9.733v2.133H12V10h2.133V7.733H16.4V5.6Z" />

</vector>

packages/SystemUI/res/drawable/stat_sys_data_fully_connected_hp.xml

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

    Copyright (C) 2014 The CyanogenMod 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="8.454dp"

        android:height="17dp"

        android:viewportWidth="8.454"

        android:viewportHeight="17">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M4.25,7.792H3.117V5.313H1.204v2.479H0V1.771h1.204v2.621h1.912V1.771H4.25V7.792Z" />

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M8.454,2.975H7.25V1.771H6.117v1.204H4.912v1.133h1.205v1.205H7.25V4.108h1.204V2.975Z" />

</vector>

packages/SystemUI/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



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

    <string name="accessibility_data_connection_hspap">HSPA+</string>



    <!-- Weather string format in expanded statusbar header -->

    <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>

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

+3 −0
Original line number Diff line number Diff line
@@ -188,6 +188,9 @@ public class MobileSignalController extends SignalController< 
        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSDPA, hGroup);

        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSUPA, hGroup);

        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSPA, hGroup);

        if (mConfig.hspaDataDistinguishable) {

            hGroup = TelephonyIcons.HP;

        }

        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSPAP, hGroup);



        if (mConfig.show4gForLte) {

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

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

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

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

                            datatype.equals("h+") ? TelephonyIcons.HP :

                            datatype.equals("lte") ? TelephonyIcons.LTE :

                            datatype.equals("roam") ? TelephonyIcons.ROAMING :

                            TelephonyIcons.UNKNOWN;