SystemUI: Revert CAF UI modifications

Revert "SystemUI: Support display for radio tech"

This reverts commit 598421095aacb599d4bc8e8fcea20734d7847d0c.

Revert "SystemUI: Customize StatusBar for Chinese carrier"

This reverts commit d473d0b22ac8704c39d5eedd0d7b12f60a2fa215.

Revert "Statusbar: Add customized icons for Chinese carrier"

This reverts commit a6324c7293bebeff4c6ccee8c2a8af38b7a150a8.

Change-Id: Ib03c7455a04bd7d63a8c0a7d238040099e94e89c

2 files changed, 0 insertions, 64 deletions

diff --git a/packages/Keyguard/src/com/android/keyguard/CarrierText.java b/packages/Keyguard/src/com/android/keyguard/CarrierText.java
index 230ad42..f04db02 100644
--- a/packages/Keyguard/src/com/android/keyguard/CarrierText.java
+++ b/packages/Keyguard/src/com/android/keyguard/CarrierText.java
@@ -28,7 +28,6 @@ import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
-import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.text.method.SingleLineTransformationMethod;
 import android.util.AttributeSet;
@@ -154,59 +153,15 @@ public class CarrierText extends TextView {
     protected void updateCarrierText() {
         boolean allSimsMissing = true;
         boolean anySimReadyAndInService = false;
-        boolean showLocale = getContext().getResources().getBoolean(
-                com.android.internal.R.bool.config_monitor_locale_change);
-        boolean showRat = getContext().getResources().getBoolean(
-                com.android.internal.R.bool.config_display_rat);
         CharSequence displayText = null;
 
         List<SubscriptionInfo> subs = mKeyguardUpdateMonitor.getSubscriptionInfo(false);
         final int N = subs.size();
         if (DEBUG) Log.d(TAG, "updateCarrierText(): " + N);
         for (int i = 0; i < N; i++) {
-            CharSequence networkClass = "";
             int subId = subs.get(i).getSubscriptionId();
             State simState = mKeyguardUpdateMonitor.getSimState(subId);
-            if (showRat) {
-                ServiceState ss = mKeyguardUpdateMonitor.mServiceStates.get(subId);
-                TelephonyManager tm = new TelephonyManager(getContext());
-                if (ss != null && (ss.getDataRegState() == ServiceState.STATE_IN_SERVICE
-                        || ss.getVoiceRegState() == ServiceState.STATE_IN_SERVICE)) {
-                    int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
-                    if (ss.getRilDataRadioTechnology() !=
-                            ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {
-                        networkType = ss.getDataNetworkType();
-                    } else if (ss.getRilVoiceRadioTechnology() !=
-                                ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {
-                        networkType = ss.getVoiceNetworkType();
-                    }
-                    networkClass = tm.networkClassToString(networkType);
-                }
-            }
             CharSequence carrierName = subs.get(i).getCarrierName();
-            if (showLocale || showRat) {
-                String[] names = carrierName.toString().split(mSeparator.toString(), 2);
-                StringBuilder newCarrierName = new StringBuilder();
-                for (int j = 0; j < names.length; j++) {
-                    if (showLocale) {
-                        names[j] = android.util.NativeTextHelper.getLocalString(getContext(),
-                                names[j], com.android.internal.R.array.origin_carrier_names,
-                                com.android.internal.R.array.locale_carrier_names);
-                    }
-                    if (!TextUtils.isEmpty(names[j])) {
-                        if (!TextUtils.isEmpty(networkClass) && showRat) {
-                            names[j] = new StringBuilder().append(names[j]).append(" ")
-                                    .append(networkClass).toString();
-                        }
-                        if (j > 0 && names[j].equals(names[j-1])) {
-                            continue;
-                        }
-                        if (j > 0) newCarrierName.append(mSeparator);
-                        newCarrierName.append(names[j]);
-                    }
-                }
-                carrierName = newCarrierName.toString();
-            }
             CharSequence carrierTextForSimState = getCarrierTextForSimState(simState, carrierName);
             if (DEBUG) {
                 Log.d(TAG, "Handling (subId=" + subId + "): " + simState + " " + carrierName);
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index e82db97..5e09729 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -136,7 +136,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     private static final int MSG_SERVICE_STATE_CHANGE = 330;
     private static final int MSG_SCREEN_TURNED_ON = 331;
     private static final int MSG_SCREEN_TURNED_OFF = 332;
-    private static final int MSG_LOCALE_CHANGED = 500;
 
     /** Fingerprint state: Not listening to fingerprint. */
     private static final int FINGERPRINT_STATE_STOPPED = 0;
@@ -275,9 +274,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
                 case MSG_SCREEN_TURNED_OFF:
                     handleScreenTurnedOff();
                     break;
-                case MSG_LOCALE_CHANGED:
-                    handleLocaleChanged();
-                    break;
             }
         }
     };
@@ -654,8 +650,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
                 }
                 mHandler.sendMessage(
                         mHandler.obtainMessage(MSG_SERVICE_STATE_CHANGE, subId, 0, serviceState));
-            } else if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
-                mHandler.sendEmptyMessage(MSG_LOCALE_CHANGED);
             }
         }
     };
@@ -984,7 +978,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
         filter.addAction(Intent.ACTION_BATTERY_CHANGED);
         filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
         filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);
-        filter.addAction(Intent.ACTION_LOCALE_CHANGED);
         filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
         filter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
         filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
@@ -1325,18 +1318,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     }
 
     /**
-     * Handle {@link #MSG_LOCALE_CHANGED}
-     */
-    private void handleLocaleChanged() {
-        for (int j = 0; j < mCallbacks.size(); j++) {
-            KeyguardUpdateMonitorCallback cb = mCallbacks.get(j).get();
-            if (cb != null) {
-                cb.onRefreshCarrierInfo();
-            }
-        }
-    }
-
-    /**
      * Handle {@link #MSG_SERVICE_STATE_CHANGE}
      */
     private void handleServiceStateChange(int subId, ServiceState serviceState) {