diff options
| author | Jim Miller <jaggies@google.com> | 2009-11-17 22:58:23 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-17 22:58:23 -0800 |
| commit | ee3fd99a0ba0d0c3d969050454a07482259bcf0c (patch) | |
| tree | e05520dab05807b00c893c77b07a0cb6bde0d907 /core | |
| parent | d68d6c6ddabb6bc1e78b38c9c2dd6beda7970f8d (diff) | |
| parent | 30998a59aced3248b3a6f5e507dba0394fb54cad (diff) | |
| download | frameworks_base-ee3fd99a0ba0d0c3d969050454a07482259bcf0c.zip frameworks_base-ee3fd99a0ba0d0c3d969050454a07482259bcf0c.tar.gz frameworks_base-ee3fd99a0ba0d0c3d969050454a07482259bcf0c.tar.bz2 | |
am 30998a59: Merge change I587dd820 into eclair
Merge commit '30998a59aced3248b3a6f5e507dba0394fb54cad' into eclair-mr2
* commit '30998a59aced3248b3a6f5e507dba0394fb54cad':
Fix 2268841: Much better looking layout for pattern lock screen.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/layout/keyguard_screen_unlock_portrait.xml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index bc7f9a9..5916786 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -38,6 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" + android:layout_marginTop="6dip" android:layout_alignParentRight="true" android:layout_marginRight="8dip" android:textAppearance="?android:attr/textAppearanceMedium" @@ -46,17 +47,18 @@ <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/carrier" android:layout_alignParentLeft="true" - android:layout_marginBottom="8dip" - android:layout_marginLeft="24dip" + android:layout_alignParentTop="true" + android:layout_marginTop="15dip" + android:layout_marginBottom="6dip" + android:layout_marginLeft="20dip" > <TextView android:id="@+id/timeDisplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="bottom" - android:textSize="72sp" + android:textSize="56sp" android:textAppearance="?android:attr/textAppearanceMedium" android:shadowColor="#C0000000" android:shadowDx="0" @@ -64,14 +66,13 @@ android:shadowRadius="3.0" /> - <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" android:layout_height="fill_parent" android:gravity="bottom" - android:textSize="22sp" + android:textSize="18sp" android:singleLine="true" - android:layout_marginLeft="8dip" + android:layout_marginLeft="4dip" android:layout_marginBottom="-6dip" android:textAppearance="?android:attr/textAppearanceMedium" android:shadowColor="#C0000000" @@ -87,7 +88,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/time" - android:layout_marginLeft="16dip" + android:layout_marginLeft="24dip" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -95,7 +96,6 @@ <View android:id="@+id/divider" - android:layout_below="@id/date" android:layout_width="fill_parent" android:layout_height="1dip" android:layout_marginTop="8dip" @@ -109,8 +109,8 @@ android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginTop="3dip" - android:layout_marginLeft="16dip" + android:layout_marginTop="0dip" + android:layout_marginLeft="12dip" android:gravity="left" > <TextView @@ -118,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp" + android:textSize="18sp" android:drawablePadding="4dip" /> <TextView @@ -128,7 +128,7 @@ android:layout_marginLeft="5dip" android:layout_marginRight="5dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp" + android:textSize="18sp" /> <TextView android:id="@+id/status2" @@ -136,7 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp" + android:textSize="18sp" android:drawablePadding="4dip" /> </LinearLayout> |