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

Commit 0ee63991 authored by Vagdevi Kondeti's avatar Vagdevi Kondeti Committed by android-build-merger
Browse files

Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev 

am: d7a23cc7

Change-Id: If7cfcd1d1ab3846bff9b941a2b13d16d9f415a3f
parents 961d48ab d7a23cc7

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

+5 −1
Original line number Diff line number Diff line
@@ -216,10 +216,14 @@ public class MobileSignalController extends SignalController< 


        MobileIconGroup hGroup = TelephonyIcons.THREE_G;

        MobileIconGroup hPlusGroup = TelephonyIcons.THREE_G;

        if (mConfig.hspaDataDistinguishable) {

        if (mConfig.show4gFor3g) {

            hGroup = TelephonyIcons.FOUR_G;

            hPlusGroup = TelephonyIcons.FOUR_G;

        } else if (mConfig.hspaDataDistinguishable) {

            hGroup = TelephonyIcons.H;

            hPlusGroup = TelephonyIcons.H_PLUS;

        }



        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSDPA, hGroup);

        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSUPA, hGroup);

        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSPA, hGroup);

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

+3 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        Map<Integer, MobileIconGroup> nr5GIconMap = new HashMap<>();



        boolean showAtLeast3G = false;

        boolean show4gFor3g = false;

        boolean alwaysShowCdmaRssi = false;

        boolean show4gForLte = false;

        boolean hideLtePlus = false;
@@ -1158,6 +1159,8 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                        CarrierConfigManager.KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL);

                config.show4gForLte = b.getBoolean(

                        CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);

                config.show4gFor3g = b.getBoolean(

                        CarrierConfigManager.KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL);

                config.hideLtePlus = b.getBoolean(

                        CarrierConfigManager.KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL);

                config.patternOfCarrierSpecificDataIcon = b.getString(

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1420,6 +1420,13 @@ public class CarrierConfigManager { 
    public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL =

            "show_4g_for_lte_data_icon_bool";



    /**

     * Boolean indicating if default data account should show 4G icon when in 3G.

     * @hide

     */

    public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL =

            "show_4g_for_3g_data_icon_bool";



    /**

     * Boolean indicating if lte+ icon should be shown if available

     * @hide
@@ -3440,6 +3447,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL, false);

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL, false);

        sDefaults.putString(KEY_OPERATOR_NAME_FILTER_PATTERN_STRING, "");

        sDefaults.putString(KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING, "");

        sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, true);