Revert "Support to show long or short name in SystemUI."

This config option introduced by CAF seems pretty pointless.
Revert the original CAF commit to reduce deviation from AOSP.

This essentially reverts commit 9bb392c0fcdb41870cd7b1c004250e92bbf0672f.

Change-Id: I8439467f26ae1d612146f1213dfa90e8c0fecc7e

diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 75c6467..fcec8ad 100755 (executable)
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -304,8 +304,5 @@
 
     <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>
 </resources>
 

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
index 2ae5a15..1144867 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -625,12 +625,6 @@ public class MobileSignalController extends SignalController<
             mCurrentState.networkName = mServiceState.getOperatorAlphaShort();
         }
 
-        if (!showLongOperatorName() && mServiceState != null) {
-            mCurrentState.networkNameData = TextUtils.isEmpty(mServiceState.
-                    getOperatorAlphaShort()) ? mCurrentState.networkNameData : mServiceState.
-                    getOperatorAlphaShort() + " " + getNetworkClassString(mServiceState);
-        }
-
         if (mConfig.readIconsFromXml) {
             mCurrentState.voiceLevel = getVoiceSignalLevel();
         }
@@ -646,15 +640,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;
-    }
-
     private void generateIconGroup() {
         final int level = mCurrentState.level;
         final int voiceLevel = mCurrentState.voiceLevel;