Revert "Support to show long or short name in SystemUI." (f809f7c2) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/config.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -287,9 +287,6 @@
		<bool name="config_show4gForIWlan">false</bool>
		<bool name="config_showSignalForIWlan">false</bool>

		<bool name="config_show_long_operator_name">false</bool>
		<bool name="config_show_long_operator_name_when_roaming">false</bool>

		<!-- Allow the flashlight service to use wakelocks -->
		<bool name="config_useWakelockForFlashlight">false</bool>
		</resources>

+0 −15

Original line number	Diff line number	Diff line
		@@ -431,12 +431,6 @@ public class MobileSignalController extends SignalController<
		mCurrentState.networkName = mServiceState.getOperatorAlphaShort();
		}

		if (!showLongOperatorName()) {
		mCurrentState.networkNameData = TextUtils.isEmpty(mServiceState.
		getOperatorAlphaShort()) ? mCurrentState.networkNameData : mServiceState.
		getOperatorAlphaShort() + " " + getNetworkClassString(mServiceState);
		}

		notifyListenersIfNecessary();
		}

		@@ -444,15 +438,6 @@ public class MobileSignalController extends SignalController<
		return !mPhone.getDataEnabled(mSubscriptionInfo.getSubscriptionId());
		}

		private boolean showLongOperatorName() {
		if (mContext.getResources().getBoolean(R.bool.config_show_long_operator_name) \|\| (mContext.
		getResources().getBoolean(R.bool.config_show_long_operator_name_when_roaming) &&
		isRoaming())) {
		return true;
		}
		return false;
		}

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