Merge "Add data disabled icon" (13548550) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/ic_qs_data_disabled.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2016 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="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="40.0"
		android:viewportHeight="40.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M19.0,6.41L17.59,5.0 12.0,10.59 6.41,5.0 5.0,6.41 10.59,12.0 5.0,17.59 6.41,19.0 12.0,13.41 17.59,19.0 19.0,17.59 13.41,12.0z"/>
		</vector>

packages/SystemUI/res/drawable/stat_sys_data_disabled.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2016 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="17.0dp"
		android:height="17.0dp"
		android:viewportWidth="40.0"
		android:viewportHeight="40.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M19.0,6.41L17.59,5.0 12.0,10.59 6.41,5.0 5.0,6.41 10.59,12.0 5.0,17.59 6.41,19.0 12.0,13.41 17.59,19.0 19.0,17.59 13.41,12.0z"/>
		</vector>

packages/SystemUI/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -359,6 +359,9 @@
		<!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_no_sim">No SIM.</string>

		<!-- Content description of the cell data being disabled. [CHAR LIMIT=NONE] -->
		<string name="accessibility_cell_data_off">Cellular 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>

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -206,7 +206,8 @@ public class MobileSignalController extends SignalController<

		// Show icon in QS when we are connected or need to show roaming.
		boolean showDataIcon = mCurrentState.dataConnected
		\|\| mCurrentState.iconGroup == TelephonyIcons.ROAMING;
		\|\| mCurrentState.iconGroup == TelephonyIcons.ROAMING
		\|\| mCurrentState.iconGroup == TelephonyIcons.DATA_DISABLED;
		IconState statusIcon = new IconState(mCurrentState.enabled && !mCurrentState.airplaneMode,
		getCurrentIconId(), contentDescription);

		@@ -227,7 +228,8 @@ public class MobileSignalController extends SignalController<
		&& !mCurrentState.carrierNetworkChangeMode
		&& mCurrentState.activityOut;
		showDataIcon &= mCurrentState.isDefault
		\|\| mCurrentState.iconGroup == TelephonyIcons.ROAMING;
		\|\| mCurrentState.iconGroup == TelephonyIcons.ROAMING
		\|\| mCurrentState.iconGroup == TelephonyIcons.DATA_DISABLED;
		int typeIcon = showDataIcon ? icons.mDataType : 0;
		mCallbackHandler.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon,
		activityIn, activityOut, dataContentDescription, description, icons.mIsWide,
		@@ -385,6 +387,8 @@ public class MobileSignalController extends SignalController<
		mCurrentState.iconGroup = TelephonyIcons.CARRIER_NETWORK_CHANGE;
		} else if (isRoaming()) {
		mCurrentState.iconGroup = TelephonyIcons.ROAMING;
		} else if (isDataDisabled()) {
		mCurrentState.iconGroup = TelephonyIcons.DATA_DISABLED;
		}
		if (isEmergencyOnly() != mCurrentState.isEmergency) {
		mCurrentState.isEmergency = isEmergencyOnly();
		@@ -399,6 +403,10 @@ public class MobileSignalController extends SignalController<
		notifyListenersIfNecessary();
		}

		private boolean isDataDisabled() {
		return !mPhone.getDataEnabled(mSubscriptionInfo.getSubscriptionId());
		}

		@VisibleForTesting
		void setActivity(int activity) {
		mCurrentState.activityIn = activity == TelephonyManager.DATA_ACTIVITY_INOUT

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -208,6 +208,8 @@ class TelephonyIcons {
		static final int ICON_CARRIER_NETWORK_CHANGE =
		R.drawable.stat_sys_signal_carrier_network_change_animation;

		static final int ICON_DATA_DISABLED = R.drawable.stat_sys_data_disabled;

		static final int QS_ICON_LTE = R.drawable.ic_qs_signal_lte;
		static final int QS_ICON_3G = R.drawable.ic_qs_signal_3g;
		static final int QS_ICON_4G = R.drawable.ic_qs_signal_4g;
		@@ -215,6 +217,8 @@ class TelephonyIcons {
		static final int QS_ICON_CARRIER_NETWORK_CHANGE =
		R.drawable.ic_qs_signal_carrier_network_change_animation;

		static final int QS_ICON_DATA_DISABLED = R.drawable.ic_qs_data_disabled;

		static final MobileIconGroup CARRIER_NETWORK_CHANGE = new MobileIconGroup(
		"CARRIER_NETWORK_CHANGE",
		TelephonyIcons.TELEPHONY_CARRIER_NETWORK_CHANGE,
		@@ -373,5 +377,20 @@ class TelephonyIcons {
		false,
		TelephonyIcons.QS_DATA_R
		);

		static final MobileIconGroup DATA_DISABLED = new MobileIconGroup(
		"DataDisabled",
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH,
		TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH,
		AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH,
		0, 0,
		TelephonyIcons.TELEPHONY_NO_NETWORK,
		TelephonyIcons.QS_TELEPHONY_NO_NETWORK,
		AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0],
		R.string.accessibility_cell_data_off,
		TelephonyIcons.ICON_DATA_DISABLED,
		false,
		TelephonyIcons.QS_ICON_DATA_DISABLED
		);
		}