Merge "Merge "Remove the activity info from InternetTile" into tm-qpr-dev am:... (601bc1fc) · Commits · e / os / android_frameworks_base

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

+0 −16

Original line number	Diff line number	Diff line
		@@ -188,8 +188,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
		int mWifiSignalIconId;
		@Nullable
		String mSsid;
		boolean mActivityIn;
		boolean mActivityOut;
		@Nullable
		String mWifiSignalContentDescription;
		boolean mIsTransient;
		@@ -207,8 +205,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
		.append(",mConnected=").append(mConnected)
		.append(",mWifiSignalIconId=").append(mWifiSignalIconId)
		.append(",mSsid=").append(mSsid)
		.append(",mActivityIn=").append(mActivityIn)
		.append(",mActivityOut=").append(mActivityOut)
		.append(",mWifiSignalContentDescription=").append(mWifiSignalContentDescription)
		.append(",mIsTransient=").append(mIsTransient)
		.append(",mNoDefaultNetwork=").append(mNoDefaultNetwork)
		@@ -226,8 +222,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
		CharSequence mDataContentDescription;
		int mMobileSignalIconId;
		int mQsTypeIcon;
		boolean mActivityIn;
		boolean mActivityOut;
		boolean mNoSim;
		boolean mRoaming;
		boolean mMultipleSubs;
		@@ -243,8 +237,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
		.append(",mDataContentDescription=").append(mDataContentDescription)
		.append(",mMobileSignalIconId=").append(mMobileSignalIconId)
		.append(",mQsTypeIcon=").append(mQsTypeIcon)
		.append(",mActivityIn=").append(mActivityIn)
		.append(",mActivityOut=").append(mActivityOut)
		.append(",mNoSim=").append(mNoSim)
		.append(",mRoaming=").append(mRoaming)
		.append(",mMultipleSubs=").append(mMultipleSubs)
		@@ -275,8 +267,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
		mWifiInfo.mWifiSignalContentDescription = indicators.qsIcon.contentDescription;
		mWifiInfo.mEnabled = indicators.enabled;
		mWifiInfo.mSsid = indicators.description;
		mWifiInfo.mActivityIn = indicators.activityIn;
		mWifiInfo.mActivityOut = indicators.activityOut;
		mWifiInfo.mIsTransient = indicators.isTransient;
		mWifiInfo.mStatusLabel = indicators.statusLabel;
		refreshState(mWifiInfo);
		@@ -297,8 +287,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
		? indicators.typeContentDescriptionHtml : null;
		mCellularInfo.mMobileSignalIconId = indicators.qsIcon.icon;
		mCellularInfo.mQsTypeIcon = indicators.qsType;
		mCellularInfo.mActivityIn = indicators.activityIn;
		mCellularInfo.mActivityOut = indicators.activityOut;
		mCellularInfo.mRoaming = indicators.roaming;
		mCellularInfo.mMultipleSubs = mController.getNumberSubscriptions() > 1;
		refreshState(mCellularInfo);
		@@ -428,8 +416,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
		state.state = Tile.STATE_ACTIVE;
		state.dualTarget = true;
		state.value = cb.mEnabled;
		state.activityIn = cb.mEnabled && cb.mActivityIn;
		state.activityOut = cb.mEnabled && cb.mActivityOut;
		final StringBuffer minimalContentDescription = new StringBuffer();
		final StringBuffer minimalStateDescription = new StringBuffer();
		final Resources r = mContext.getResources();
		@@ -503,8 +489,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
		boolean mobileDataEnabled = mDataController.isMobileDataSupported()
		&& mDataController.isMobileDataEnabled();
		state.value = mobileDataEnabled;
		state.activityIn = mobileDataEnabled && cb.mActivityIn;
		state.activityOut = mobileDataEnabled && cb.mActivityOut;
		state.expandedAccessibilityClassName = Switch.class.getName();

		if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) {