Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 30998a59: Merge change I587dd820 into eclair

Browse Source 
Merge commit '30998a59aced3248b3a6f5e507dba0394fb54cad' into eclair-mr2

* commit '30998a59aced3248b3a6f5e507dba0394fb54cad':
  Fix 2268841: Much better looking layout for pattern lock screen.
This commit is contained in:
Jim Miller
2009-11-17 22:58:23 -08:00
committed by Android Git Automerger
parent d68d6c6dda 30998a59ac
commit ee3fd99a0b
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/res/res/layout/keyguard_screen_unlock_portrait.xml
View File

@@ -38,6 +38,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="6dip"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="8dip" android:layout_marginRight="8dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
@@ -46,17 +47,18 @@
<com.android.internal.widget.DigitalClock android:id="@+id/time" <com.android.internal.widget.DigitalClock android:id="@+id/time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/carrier"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginBottom="8dip" android:layout_alignParentTop="true"
android:layout_marginLeft="24dip" android:layout_marginTop="15dip"
android:layout_marginBottom="6dip"
android:layout_marginLeft="20dip"
> >
<TextView android:id="@+id/timeDisplay" <TextView android:id="@+id/timeDisplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="bottom" android:gravity="bottom"
android:textSize="72sp" android:textSize="56sp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000" android:shadowColor="#C0000000"
android:shadowDx="0" android:shadowDx="0"
@@ -64,14 +66,13 @@
android:shadowRadius="3.0" android:shadowRadius="3.0"
/> />
<TextView android:id="@+id/am_pm" <TextView android:id="@+id/am_pm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="bottom" android:gravity="bottom"
android:textSize="22sp" android:textSize="18sp"
android:singleLine="true" android:singleLine="true"
android:layout_marginLeft="8dip" android:layout_marginLeft="4dip"
android:layout_marginBottom="-6dip" android:layout_marginBottom="-6dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000" android:shadowColor="#C0000000"
@@ -87,7 +88,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/time" android:layout_below="@id/time"
android:layout_marginLeft="16dip" android:layout_marginLeft="24dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
/> />
@@ -95,7 +96,6 @@
<View <View
android:id="@+id/divider" android:id="@+id/divider"
android:layout_below="@id/date"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="1dip" android:layout_height="1dip"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
@@ -109,8 +109,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="3dip" android:layout_marginTop="0dip"
android:layout_marginLeft="16dip" android:layout_marginLeft="12dip"
android:gravity="left" android:gravity="left"
> >
<TextView <TextView
@@ -118,7 +118,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="17sp" android:textSize="18sp"
android:drawablePadding="4dip" android:drawablePadding="4dip"
/> />
<TextView <TextView
@@ -128,7 +128,7 @@
android:layout_marginLeft="5dip" android:layout_marginLeft="5dip"
android:layout_marginRight="5dip" android:layout_marginRight="5dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="17sp" android:textSize="18sp"
/> />
<TextView <TextView
android:id="@+id/status2" android:id="@+id/status2"
@@ -136,7 +136,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="17sp" android:textSize="18sp"
android:drawablePadding="4dip" android:drawablePadding="4dip"
/> />
</LinearLayout> </LinearLayout>