Merge "Show 4G LTE and 4G LTE+ data connection type" am: c5fbfeb8f5 am:... (8cf8cce9) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/drawable/ic_4g_lte_mobiledata.xml

0 → 100644

+25 −0

Original line number	Original line	Diff line number	Diff line
			<!--
			Copyright (C) 2018 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="42.3281dp"
			android:height="24dp"
			android:viewportWidth="42.3281"
			android:viewportHeight="24">
			<path
			android:fillColor="#FFFFFFFF"
			android:pathData="M10.7871,12.959H11.8477V14.1016H10.7871V16H9.3633V14.1016H5.6777L5.6367,13.2344L9.3164,7.4688H10.7871V12.959ZM7.1309,12.959H9.3633V9.3965L9.2578,9.584L7.1309,12.959ZM19.5586,14.8926C19.25,15.2949 18.8223,15.5996 18.2754,15.8066C17.7285,16.0137 17.1074,16.1172 16.4121,16.1172C15.6973,16.1172 15.0645,15.9551 14.5137,15.6309C13.9629,15.3066 13.5371,14.8438 13.2363,14.2422C12.9395,13.6367 12.7852,12.9316 12.7734,12.127V11.459C12.7734,10.1699 13.082,9.1641 13.6992,8.4414C14.3164,7.7148 15.1777,7.3516 16.2832,7.3516C17.2324,7.3516 17.9863,7.5859 18.5449,8.0547C19.1035,8.5234 19.4395,9.1992 19.5527,10.082H18.0996C17.9355,9.0547 17.3398,8.541 16.3125,8.541C15.6484,8.541 15.1426,8.7813 14.7949,9.2617C14.4512,9.7383 14.2734,10.4395 14.2617,11.3652V12.0215C14.2617,12.9434 14.4551,13.6602 14.8418,14.1719C15.2324,14.6797 15.7734,14.9336 16.4648,14.9336C17.2227,14.9336 17.7617,14.7617 18.082,14.418V12.748H16.3242V11.623H19.5586V14.8926ZM25.6582,14.8164H29.5312V16H24.1758V7.4688H25.6582V14.8164ZM35.625,8.6641H32.9648V16H31.4941V8.6641H28.8574V7.4688H35.625V8.6641ZM41.7363,12.1914H38.2324V14.8164H42.3281V16H36.75V7.4688H42.2871V8.6641H38.2324V11.0195H41.7363V12.1914Z" />

			</vector>

packages/SettingsLib/res/drawable/ic_4g_lte_plus_mobiledata.xml

0 → 100644

+29 −0

Original line number	Original line	Diff line number	Diff line
			<!--
			Copyright (C) 2018 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="49.65dp"
			android:height="24dp"
			android:viewportWidth="49.65"
			android:viewportHeight="24">
			<path
			android:fillColor="#FFFFFFFF"
			android:pathData="M10.7871,12.959H11.8477V14.1016H10.7871V16H9.3633V14.1016H5.6777L5.6367,13.2344L9.3164,7.4688H10.7871V12.959ZM7.1309,12.959H9.3633V9.3965L9.2578,9.584L7.1309,12.959ZM19.5586,14.8926C19.25,15.2949 18.8223,15.5996 18.2754,15.8066C17.7285,16.0137 17.1074,16.1172 16.4121,16.1172C15.6973,16.1172 15.0645,15.9551 14.5137,15.6309C13.9629,15.3066 13.5371,14.8438 13.2363,14.2422C12.9395,13.6367 12.7852,12.9316 12.7734,12.127V11.459C12.7734,10.1699 13.082,9.1641 13.6992,8.4414C14.3164,7.7148 15.1777,7.3516 16.2832,7.3516C17.2324,7.3516 17.9863,7.5859 18.5449,8.0547C19.1035,8.5234 19.4395,9.1992 19.5527,10.082H18.0996C17.9355,9.0547 17.3398,8.541 16.3125,8.541C15.6484,8.541 15.1426,8.7813 14.7949,9.2617C14.4512,9.7383 14.2734,10.4395 14.2617,11.3652V12.0215C14.2617,12.9434 14.4551,13.6602 14.8418,14.1719C15.2324,14.6797 15.7734,14.9336 16.4648,14.9336C17.2227,14.9336 17.7617,14.7617 18.082,14.418V12.748H16.3242V11.623H19.5586V14.8926ZM25.6582,14.8164H29.5312V16H24.1758V7.4688H25.6582V14.8164ZM35.625,8.6641H32.9648V16H31.4941V8.6641H28.8574V7.4688H35.625V8.6641ZM41.7363,12.1914H38.2324V14.8164H42.3281V16H36.75V7.4688H42.2871V8.6641H38.2324V11.0195H41.7363V12.1914Z" />

			<path
			android:fillColor="#FFFFFFFF"
			android:pathData="M 47.3 9.74L 47.3 7.39L 46 7.39L 46 9.74L 43.65 9.74L 43.65 11.04L 46 11.04L 46 13.39L 47.3 13.39L 47.3 11.04L 49.65 11.04L 49.65 9.74Z" />

			</vector>

packages/SettingsLib/res/values/strings.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1504,6 +1504,12 @@
	<!-- Content description of the data connection type LTE+. [CHAR LIMIT=NONE] -->		<!-- Content description of the data connection type LTE+. [CHAR LIMIT=NONE] -->
	<string name="data_connection_lte_plus">LTE+</string>		<string name="data_connection_lte_plus">LTE+</string>

			<!-- Content description of the data connection type 4G LTE . [CHAR LIMIT=NONE] -->
			<string name="data_connection_4g_lte" translatable="false">4G LTE</string>

			<!-- Content description of the data connection type 4G LTE+ . [CHAR LIMIT=NONE] -->
			<string name="data_connection_4g_lte_plus" translatable="false">4G LTE+</string>

	<!-- Content description of the data connection type 5Ge with HTML styling. DO NOT TRANSLATE [CHAR LIMIT=NONE] -->		<!-- Content description of the data connection type 5Ge with HTML styling. DO NOT TRANSLATE [CHAR LIMIT=NONE] -->
	<string name="data_connection_5ge_html" translate="false"> <i>5G <small>E</small></i> </string>		<string name="data_connection_5ge_html" translate="false"> <i>5G <small>E</small></i> </string>

packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -160,6 +160,19 @@ public class MobileMappings {
	TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA),		TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA),
	TelephonyIcons.FOUR_G_PLUS);		TelephonyIcons.FOUR_G_PLUS);
	}		}
			} else if (config.show4glteForLte) {
			networkToIconLookup.put(toIconKey(
			TelephonyManager.NETWORK_TYPE_LTE),
			TelephonyIcons.FOUR_G_LTE);
			if (config.hideLtePlus) {
			networkToIconLookup.put(toDisplayIconKey(
			TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA),
			TelephonyIcons.FOUR_G_LTE);
			} else {
			networkToIconLookup.put(toDisplayIconKey(
			TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA),
			TelephonyIcons.FOUR_G_LTE_PLUS);
			}
	} else {		} else {
	networkToIconLookup.put(toIconKey(		networkToIconLookup.put(toIconKey(
	TelephonyManager.NETWORK_TYPE_LTE),		TelephonyManager.NETWORK_TYPE_LTE),
	@@ -200,6 +213,7 @@ public class MobileMappings {
	public boolean show4gFor3g = false;		public boolean show4gFor3g = false;
	public boolean alwaysShowCdmaRssi = false;		public boolean alwaysShowCdmaRssi = false;
	public boolean show4gForLte = false;		public boolean show4gForLte = false;
			public boolean show4glteForLte = false;
	public boolean hideLtePlus = false;		public boolean hideLtePlus = false;
	public boolean hspaDataDistinguishable;		public boolean hspaDataDistinguishable;
	public boolean alwaysShowDataRatIcon = false;		public boolean alwaysShowDataRatIcon = false;
	@@ -228,6 +242,8 @@ public class MobileMappings {
	CarrierConfigManager.KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL);		CarrierConfigManager.KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL);
	config.show4gForLte = b.getBoolean(		config.show4gForLte = b.getBoolean(
	CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);		CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
			config.show4glteForLte = b.getBoolean(
			CarrierConfigManager.KEY_SHOW_4GLTE_FOR_LTE_DATA_ICON_BOOL);
	config.show4gFor3g = b.getBoolean(		config.show4gFor3g = b.getBoolean(
	CarrierConfigManager.KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL);		CarrierConfigManager.KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL);
	config.hideLtePlus = b.getBoolean(		config.hideLtePlus = b.getBoolean(

packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java

+32 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,8 @@ public class TelephonyIcons {
	public static final int ICON_3G = R.drawable.ic_3g_mobiledata;		public static final int ICON_3G = R.drawable.ic_3g_mobiledata;
	public static final int ICON_4G = R.drawable.ic_4g_mobiledata;		public static final int ICON_4G = R.drawable.ic_4g_mobiledata;
	public static final int ICON_4G_PLUS = R.drawable.ic_4g_plus_mobiledata;		public static final int ICON_4G_PLUS = R.drawable.ic_4g_plus_mobiledata;
			public static final int ICON_4G_LTE = R.drawable.ic_4g_lte_mobiledata;
			public static final int ICON_4G_LTE_PLUS = R.drawable.ic_4g_lte_plus_mobiledata;
	public static final int ICON_5G_E = R.drawable.ic_5g_e_mobiledata;		public static final int ICON_5G_E = R.drawable.ic_5g_e_mobiledata;
	public static final int ICON_1X = R.drawable.ic_1x_mobiledata;		public static final int ICON_1X = R.drawable.ic_1x_mobiledata;
	public static final int ICON_5G = R.drawable.ic_5g_mobiledata;		public static final int ICON_5G = R.drawable.ic_5g_mobiledata;
	@@ -225,6 +227,34 @@ public class TelephonyIcons {
	TelephonyIcons.ICON_LTE_PLUS		TelephonyIcons.ICON_LTE_PLUS
	);		);

			public static final MobileIconGroup FOUR_G_LTE = new MobileIconGroup(
			"4G LTE",
			null,
			null,
			AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH,
			0,
			0,
			0,
			0,
			AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0],
			R.string.data_connection_4g_lte,
			TelephonyIcons.ICON_4G_LTE
			);

			public static final MobileIconGroup FOUR_G_LTE_PLUS = new MobileIconGroup(
			"4G LTE+",
			null,
			null,
			AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH,
			0,
			0,
			0,
			0,
			AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0],
			R.string.data_connection_4g_lte_plus,
			TelephonyIcons.ICON_4G_LTE_PLUS
			);

	public static final MobileIconGroup LTE_CA_5G_E = new MobileIconGroup(		public static final MobileIconGroup LTE_CA_5G_E = new MobileIconGroup(
	"5Ge",		"5Ge",
	null,		null,
	@@ -327,6 +357,8 @@ public class TelephonyIcons {
	ICON_NAME_TO_ICON.put("h+", H_PLUS);		ICON_NAME_TO_ICON.put("h+", H_PLUS);
	ICON_NAME_TO_ICON.put("4g", FOUR_G);		ICON_NAME_TO_ICON.put("4g", FOUR_G);
	ICON_NAME_TO_ICON.put("4g+", FOUR_G_PLUS);		ICON_NAME_TO_ICON.put("4g+", FOUR_G_PLUS);
			ICON_NAME_TO_ICON.put("4glte", FOUR_G_LTE);
			ICON_NAME_TO_ICON.put("4glte+", FOUR_G_LTE_PLUS);
	ICON_NAME_TO_ICON.put("5ge", LTE_CA_5G_E);		ICON_NAME_TO_ICON.put("5ge", LTE_CA_5G_E);
	ICON_NAME_TO_ICON.put("lte", LTE);		ICON_NAME_TO_ICON.put("lte", LTE);
	ICON_NAME_TO_ICON.put("lte+", LTE_PLUS);		ICON_NAME_TO_ICON.put("lte+", LTE_PLUS);