Merge "Add dynamic support for 4G/LTE/LTE+ icons" am: 0c9254ee66 (13d2b5f1) · Commits · e / os / android_frameworks_base

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -458,6 +458,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
		MobileSignalController controller = mMobileSignalControllers.valueAt(i);
		controller.handleBroadcast(intent);
		}
		mConfig = Config.readConfig(mContext);
		mReceiverHandler.post(this::handleConfigurationChanged);
		break;
		case TelephonyIntents.ACTION_SIM_STATE_CHANGED:
		// Avoid rebroadcast because SysUI is direct boot aware.
		@@ -1038,18 +1040,23 @@ public class NetworkControllerImpl extends BroadcastReceiver
		config.showAtLeast3G = res.getBoolean(R.bool.config_showMin3G);
		config.alwaysShowCdmaRssi =
		res.getBoolean(com.android.internal.R.bool.config_alwaysUseCdmaRssi);
		config.show4gForLte = res.getBoolean(R.bool.config_show4GForLTE);
		config.hspaDataDistinguishable =
		res.getBoolean(R.bool.config_hspa_data_distinguishable);
		config.hideLtePlus = res.getBoolean(R.bool.config_hideLtePlus);
		config.inflateSignalStrengths = res.getBoolean(R.bool.config_inflateSignalStrength);

		CarrierConfigManager configMgr = (CarrierConfigManager)
		context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
		PersistableBundle b = configMgr.getConfig();
		// Handle specific carrier config values for the default data SIM
		int defaultDataSubId = SubscriptionManager.from(context)
		.getDefaultDataSubscriptionId();
		PersistableBundle b = configMgr.getConfigForSubId(defaultDataSubId);
		if (b != null) {
		config.alwaysShowDataRatIcon = b.getBoolean(
		CarrierConfigManager.KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL);
		config.show4gForLte = b.getBoolean(
		CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
		config.hideLtePlus = b.getBoolean(
		CarrierConfigManager.KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL);
		}
		return config;
		}

telephony/java/android/telephony/CarrierConfigManager.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -1201,6 +1201,20 @@ public class CarrierConfigManager {
		public static final String KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL =
		"always_show_data_rat_icon_bool";

		/**
		* Boolean indicating if default data account should show LTE or 4G icon
		* @hide
		*/
		public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL =
		"show_4g_for_lte_data_icon_bool";

		/**
		* Boolean indicating if lte+ icon should be shown if available
		* @hide
		*/
		public static final String KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL =
		"hide_lte_plus_data_icon_bool";

		/**
		* Boolean to decide whether to show precise call failed cause to user
		* @hide
		@@ -2491,6 +2505,8 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_SHOW_PRECISE_FAILED_CAUSE_BOOL, false);
		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, true);
		sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_CONFIG_APPLIED_BOOL, false);
		sDefaults.putBoolean(KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL, false);
		sDefaults.putIntArray(KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY,