am 55418b6a: am ada2592b: Merge "Text & layout tweaks in system bar:" into honeycomb

* commit '55418b6acf177cb47366a953ae85caacc3865c69':
  Text & layout tweaks in system bar:

2 files changed, 9 insertions, 13 deletions

diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_notification_area.xml b/packages/SystemUI/res/layout-xlarge/status_bar_notification_area.xml
index 72e2c0b..5a41421 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_notification_area.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_notification_area.xml
@@ -53,7 +53,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
-                android:paddingTop="5dp"
                 android:layout_marginLeft="8dp"
                 />
         </com.android.systemui.statusbar.tablet.NotificationIconArea>
@@ -63,23 +62,25 @@
         android:id="@+id/notificationTrigger"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:gravity="center"
         >
         <com.android.systemui.statusbar.tablet.HoloClock
             android:id="@+id/clock"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
             >
             <TextView android:id="@+id/time_bg"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:singleLine="true"
-                android:textSize="72dip"
+                android:textSize="40sp"
                 android:textColor="#1f1f1f" />
             <TextView android:id="@+id/time_fg"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:singleLine="true"
-                android:textSize="72dip"
+                android:textSize="40sp"
                 android:textColor="#2e2e2e" />
         </com.android.systemui.statusbar.tablet.HoloClock>
 
@@ -101,14 +102,13 @@
             android:id="@+id/signal_battery_cluster"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:layout_marginRight="8dp"
             android:orientation="horizontal"
             android:gravity="center"
             >
             <FrameLayout
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:layout_gravity="top"
-                android:layout_marginTop="19dp"
                 android:layout_marginRight="4dp"
                 >
                 <ImageView
@@ -126,10 +126,6 @@
                 android:id="@+id/battery"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:layout_gravity="top"
-                android:layout_marginTop="19dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
                 />
         </LinearLayout>
     </LinearLayout>
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml b/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml
index 8ea0142..40f2247 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml
@@ -127,14 +127,14 @@
             android:layout_height="wrap_content"
             android:gravity="right"
             android:singleLine="true"
-            android:textSize="80sp"
+            android:textSize="72sp"
             android:textColor="#999999" />
         <TextView android:id="@+id/time_fg"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="right"
             android:singleLine="true"
-            android:textSize="80sp"
+            android:textSize="72sp"
             android:textColor="#666666" />
     </com.android.systemui.statusbar.tablet.HoloClock>
 
@@ -142,7 +142,7 @@
         android:id="@+id/date"
         style="@style/StatusBarNotificationText"
         android:layout_height="wrap_content"
-        android:layout_width="142dp"
+        android:layout_width="120dp"
         android:layout_alignBottom="@id/clock"
         android:layout_alignParentLeft="true"
         android:gravity="left"