Merge "LDPI overlay for "Make compact carrier not require reboot"" into gingerbread

overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml

@@ -37,10 +37,10 @@
         >
         <com.android.systemui.statusbar.powerwidget.PowerWidget android:id="@+id/exp_power_stat"
             android:layout_width="match_parent"
-            android:layout_height="44dip"
+            android:layout_height="wrap_content"
             />
 
-        <LinearLayout
+        <LinearLayout android:id="@+id/carrier_label_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -133,6 +133,22 @@
             </com.android.systemui.statusbar.NotificationLinearLayout>
         </ScrollView>
 
+        <LinearLayout android:id="@+id/compact_carrier_layout"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            >
+            <com.android.systemui.statusbar.CarrierLabel
+                 android:gravity="bottom|right|center"
+                 android:textAppearance="@style/TextAppearance.StatusBar.Title"
+                 android:background="@android:color/transparent"
+                 android:layout_marginRight="6.0dip"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:layout_alignParentRight="true"
+                 />
+        </LinearLayout>
+
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="match_parent"