Merge "Text & layout tweaks in system bar:" into honeycomb

This commit is contained in:
Daniel Sandler
2011-01-19 21:57:35 -08:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 13 deletions

View File

@@ -53,7 +53,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingTop="5dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
/> />
</com.android.systemui.statusbar.tablet.NotificationIconArea> </com.android.systemui.statusbar.tablet.NotificationIconArea>
@@ -63,23 +62,25 @@
android:id="@+id/notificationTrigger" android:id="@+id/notificationTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center"
> >
<com.android.systemui.statusbar.tablet.HoloClock <com.android.systemui.statusbar.tablet.HoloClock
android:id="@+id/clock" android:id="@+id/clock"
android:layout_width="wrap_content" 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" <TextView android:id="@+id/time_bg"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:singleLine="true" android:singleLine="true"
android:textSize="72dip" android:textSize="40sp"
android:textColor="#1f1f1f" /> android:textColor="#1f1f1f" />
<TextView android:id="@+id/time_fg" <TextView android:id="@+id/time_fg"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:singleLine="true" android:singleLine="true"
android:textSize="72dip" android:textSize="40sp"
android:textColor="#2e2e2e" /> android:textColor="#2e2e2e" />
</com.android.systemui.statusbar.tablet.HoloClock> </com.android.systemui.statusbar.tablet.HoloClock>
@@ -101,14 +102,13 @@
android:id="@+id/signal_battery_cluster" android:id="@+id/signal_battery_cluster"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="8dp"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center" android:gravity="center"
> >
<FrameLayout <FrameLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="top"
android:layout_marginTop="19dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
> >
<ImageView <ImageView
@@ -126,10 +126,6 @@
android:id="@+id/battery" android:id="@+id/battery"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="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>
</LinearLayout> </LinearLayout>

View File

@@ -127,14 +127,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="right"
android:singleLine="true" android:singleLine="true"
android:textSize="80sp" android:textSize="72sp"
android:textColor="#999999" /> android:textColor="#999999" />
<TextView android:id="@+id/time_fg" <TextView android:id="@+id/time_fg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="right"
android:singleLine="true" android:singleLine="true"
android:textSize="80sp" android:textSize="72sp"
android:textColor="#666666" /> android:textColor="#666666" />
</com.android.systemui.statusbar.tablet.HoloClock> </com.android.systemui.statusbar.tablet.HoloClock>
@@ -142,7 +142,7 @@
android:id="@+id/date" android:id="@+id/date"
style="@style/StatusBarNotificationText" style="@style/StatusBarNotificationText"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="142dp" android:layout_width="120dp"
android:layout_alignBottom="@id/clock" android:layout_alignBottom="@id/clock"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:gravity="left" android:gravity="left"