Merge "Add secondary text to mobile data tile." into pi-dev (96e99cbc) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/data_usage.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:text="@string/accessibility_data_connection_roaming"
		android:text="@string/data_connection_roaming"
		android:textAppearance="@style/TextAppearance.QS.DataUsage.Secondary"
		android:visibility="gone" />

packages/SystemUI/res/layout/mobile_signal_group.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@
		android:paddingBottom="3dp"
		android:scaleType="fitCenter"
		android:src="@drawable/stat_sys_roaming"
		android:contentDescription="@string/accessibility_data_connection_roaming"
		android:contentDescription="@string/data_connection_roaming"
		android:visibility="gone" />
		</FrameLayout>
		</LinearLayout>

packages/SystemUI/res/values/strings.xml

+32 −29

Original line number	Diff line number	Diff line
		@@ -362,41 +362,41 @@
		<!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_desc_connecting">Connecting.</string>

		<!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_gprs">GPRS</string>
		<!-- Content description of the data connection type GPRS. [CHAR LIMIT=NONE] -->
		<string name="data_connection_gprs">GPRS</string>

		<!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_1x">1 X</string>
		<!-- Content description of the data connection type 1x. [CHAR LIMIT=NONE] -->
		<string name="data_connection_1x">1 X</string>

		<!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_hspa">HSPA</string>
		<!-- Content description of the data connection type HSPA and its variants. [CHAR LIMIT=NONE] -->
		<string name="data_connection_hspa">HSPA</string>

		<!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_3g">3G</string>
		<!-- Content description of the data connection type 3G. [CHAR LIMIT=NONE] -->
		<string name="data_connection_3g">3G</string>

		<!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_3.5g">3.5G</string>
		<!-- Content description of the data connection type 3.5G. [CHAR LIMIT=NONE] -->
		<string name="data_connection_3_5g">3.5G</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">4G</string>
		<!-- Content description of the data connection type 4G . [CHAR LIMIT=NONE] -->
		<string name="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 4G+. [CHAR LIMIT=NONE] -->
		<string name="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>
		<!-- Content description of the data connection type LTE. [CHAR LIMIT=NONE] -->
		<string name="data_connection_lte">LTE</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_plus">LTE+</string>
		<!-- Content description of the data connection type LTE+. [CHAR LIMIT=NONE] -->
		<string name="data_connection_lte_plus">LTE+</string>

		<!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_cdma">CDMA</string>
		<!-- Content description of the data connection type CDMA. [CHAR LIMIT=NONE] -->
		<string name="data_connection_cdma">CDMA</string>

		<!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_roaming">Roaming</string>
		<!-- Content description of the roaming data connection type. [CHAR LIMIT=NONE] -->
		<string name="data_connection_roaming">Roaming</string>

		<!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_edge">Edge</string>
		<!-- Content description of the data connection type Edge. [CHAR LIMIT=NONE] -->
		<string name="data_connection_edge">EDGE</string>

		<!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_wifi">Wi-Fi</string>
		@@ -411,7 +411,7 @@
		<string name="accessibility_cell_data_on">Mobile Data On</string>

		<!-- Content description of the cell data being disabled. [CHAR LIMIT=NONE] -->
		<string name="accessibility_cell_data_off">Mobile Data Off</string>
		<string name="cell_data_off">Mobile data off</string>

		<!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_bluetooth_tether">Bluetooth tethering.</string>
		@@ -425,8 +425,8 @@
		<!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_no_sims">No SIM card.</string>

		<!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_carrier_network_change_mode">Carrier network changing.</string>
		<!-- Content description of the carrier network changing icon. [CHAR LIMIT=NONE] -->
		<string name="carrier_network_change_mode">Carrier network changing</string>

		<!-- Content description of button to open battery details icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_battery_details">Open battery details</string>
		@@ -1941,8 +1941,8 @@
		<!-- accessibility label for button to select user [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_user">Signed in as <xliff:g name="user" example="John">%s</xliff:g></string>

		<!-- accessibility label for no internet [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_no_internet">No internet.</string>
		<!-- Content description for no internet connection [CHAR LIMIT=NONE] -->
		<string name="data_connection_no_internet">No internet</string>

		<!-- accessibility label for quick settings items that open a details page [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_open_details">Open details.</string>
		@@ -2096,6 +2096,9 @@
		<!-- Quick settings tile for toggling mobile data [CHAR LIMIT=20] -->
		<string name="mobile_data">Mobile data</string>

		<!-- Quick settings tile secondary label format combining roaming with the mobile data type. [CHAR LIMIT=NONE] -->
		<string name="mobile_data_text_format"><xliff:g name="roaming_status" example="Roaming">%s</xliff:g> \u2014 <xliff:g name="mobile_data_type" example="LTE">%s</xliff:g></string>

		<!-- Label for when wifi is off in QS detail panel [CHAR LIMIT=NONE] -->
		<string name="wifi_is_off">Wi-Fi is off</string>

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+26 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.res.Resources;
		import android.os.SystemProperties;
		import android.provider.Settings;
		import android.service.quicksettings.Tile;
		import android.text.TextUtils;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -166,6 +167,9 @@ public class CellularTile extends QSTileImpl<SignalState> {
		final String signalContentDesc = cb.enabled && (cb.mobileSignalIconId > 0)
		? cb.signalContentDescription
		: r.getString(R.string.accessibility_no_signal);
		boolean mobileDataEnabled = mDataController.isMobileDataSupported()
		&& mDataController.isMobileDataEnabled();
		state.value = mobileDataEnabled;
		if (cb.noSim) {
		state.contentDescription = state.label;
		} else {
		@@ -182,11 +186,31 @@ public class CellularTile extends QSTileImpl<SignalState> {
		state.icon = new SignalIcon(cb.mobileSignalIconId);
		}

		if (cb.airplaneModeEnabled \| cb.noSim) {
		if (cb.noSim) {
		state.state = Tile.STATE_UNAVAILABLE;
		} else {
		state.secondaryLabel = r.getString(R.string.keyguard_missing_sim_message_short);
		} else if (cb.airplaneModeEnabled) {
		state.state = Tile.STATE_UNAVAILABLE;
		state.secondaryLabel = r.getString(R.string.status_bar_airplane);
		} else if (mobileDataEnabled) {
		state.state = Tile.STATE_ACTIVE;
		state.secondaryLabel = getMobileDataDescription(cb);
		} else {
		state.state = Tile.STATE_INACTIVE;
		state.secondaryLabel = r.getString(R.string.cell_data_off);
		}
		}

		private CharSequence getMobileDataDescription(CallbackInfo cb) {
		if (cb.roaming && !TextUtils.isEmpty(cb.dataContentDescription)) {
		String roaming = mContext.getString(R.string.data_connection_roaming);
		String dataDescription = cb.dataContentDescription;
		return mContext.getString(R.string.mobile_data_text_format, roaming, dataDescription);
		}
		if (cb.roaming) {
		return mContext.getString(R.string.data_connection_roaming);
		}
		return cb.dataContentDescription;
		}

		@Override

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,9 @@ public class MobileSignalController extends SignalController<

		String contentDescription = getStringIfExists(getContentDescription());
		String dataContentDescription = getStringIfExists(icons.mDataContentDescription);
		if (mCurrentState.inetCondition == 0) {
		dataContentDescription = mContext.getString(R.string.data_connection_no_internet);
		}
		final boolean dataDisabled = mCurrentState.iconGroup == TelephonyIcons.DATA_DISABLED
		&& mCurrentState.userSetup;