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

3 files changed, 18 insertions, 86 deletions

diff --git a/packages/SystemUI/res/layout/mobile_signal_group.xml b/packages/SystemUI/res/layout/mobile_signal_group.xml
index 3d25f9f..6ae5cf3 100644
--- a/packages/SystemUI/res/layout/mobile_signal_group.xml
+++ b/packages/SystemUI/res/layout/mobile_signal_group.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
- * Copyright (c) 2015 The Linux Foundation. All rights reserved.
- * Not a Contribution.
-*/
 /* apps/common/assets/default/default/skins/StatusBar.xml
 **
 ** Copyright 2011, The Android Open Source Project
@@ -21,73 +17,31 @@
 ** limitations under the License.
 */
 -->
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:systemui="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mobile_combo"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     >
-    <ImageView
-        android:layout_width="wrap_content"
+    <com.android.systemui.statusbar.AnimatedImageView
+        android:theme="@style/DualToneLightTheme"
+        android:id="@+id/mobile_signal"
         android:layout_height="wrap_content"
-        android:layout_marginStart="2dp"
-        android:id="@+id/data_inout"
-        android:visibility="gone"
+        android:layout_width="wrap_content"
+        systemui:hasOverlappingRendering="false"
         />
-    <FrameLayout
+    <com.android.systemui.statusbar.AnimatedImageView
+        android:theme="@style/DualToneDarkTheme"
+        android:id="@+id/mobile_signal_dark"
+        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:alpha="0.0"
+        systemui:hasOverlappingRendering="false"
+        />
+    <ImageView
+        android:id="@+id/mobile_type"
         android:layout_height="wrap_content"
-        >
-        <FrameLayout
-            android:id="@+id/mobile_signal_single"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            >
-            <com.android.systemui.statusbar.AnimatedImageView
-                android:theme="@style/DualToneLightTheme"
-                android:id="@+id/mobile_signal"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                systemui:hasOverlappingRendering="false"
-                />
-            <com.android.systemui.statusbar.AnimatedImageView
-                android:theme="@style/DualToneDarkTheme"
-                android:id="@+id/mobile_signal_dark"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:alpha="0.0"
-                systemui:hasOverlappingRendering="false"
-                />
-            <ImageView
-                android:id="@+id/mobile_type"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                />
-            <ImageView
-                android:id="@+id/mobile_inout"
-                android:layout_height="17dp"
-                android:layout_width="17dp"
-                android:layout_gravity="end|bottom"
-                />
-        </FrameLayout>
-        <LinearLayout
-            android:id="@+id/mobile_signal_stacked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone"
-            >
-            <ImageView
-                android:id="@+id/mobile_signal_data"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-            <ImageView
-                android:id="@+id/mobile_signal_voice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-        </LinearLayout>
-    </FrameLayout>
-</LinearLayout>
+        android:layout_width="wrap_content"
+        />
+</FrameLayout>
diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml
index 308c502..e2c1810 100644
--- a/packages/SystemUI/res/layout/signal_cluster_view.xml
+++ b/packages/SystemUI/res/layout/signal_cluster_view.xml
@@ -74,14 +74,6 @@
             android:alpha="0.0"
             systemui:hasOverlappingRendering="false"
             />
-        <com.android.systemui.statusbar.AlphaOptimizedImageView
-            android:theme="@style/DualToneLightTheme"
-            android:id="@+id/wifi_inout"
-            android:layout_height="17dp"
-            android:layout_width="18.41dp"
-            android:layout_gravity="center|bottom"
-            systemui:hasOverlappingRendering="false"
-            />
     </FrameLayout>
     <View
         android:id="@+id/wifi_signal_spacer"
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index c4e3fcd..996fb71 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -20,7 +20,6 @@
 
 <com.android.systemui.statusbar.phone.NotificationPanelView 
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/res-auto"
     xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
     android:id="@+id/notification_panel"
     android:layout_width="match_parent"
@@ -28,19 +27,6 @@
     android:background="@android:color/transparent"
     >
 
-    <com.android.keyguard.CarrierText
-        android:id="@+id/carrier_label"
-        android:layout_height="@dimen/carrier_label_height"
-        android:layout_width="match_parent"
-        android:layout_marginBottom="@dimen/close_handle_height"
-        android:layout_gravity="bottom"
-        android:gravity="center"
-        android:ellipsize="marquee"
-        android:singleLine="true"
-        android:visibility="invisible"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="#999999" />
-
     <include
         layout="@layout/keyguard_status_view"
         android:layout_height="wrap_content"