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

resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

Browse Source
This commit is contained in:
Jim Miller
2009-11-17 23:20:37 -08:00
parent 5a0db121c8 ee3fd99a0b
commit b039668155
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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_marginTop="16dip"
android:layout_marginRight="16dip"
@@ -47,18 +48,18 @@
<com.android.internal.widget.DigitalClock android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginBottom="8dip"
android:layout_marginTop="16dip"
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"
@@ -66,14 +67,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"
@@ -97,7 +97,6 @@
<View
android:id="@+id/divider"
android:layout_below="@id/date"
android:layout_width="fill_parent"
android:layout_height="1dip"
android:layout_marginTop="8dip"
@@ -111,8 +110,8 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dip"
android:layout_marginLeft="24dip"
android:layout_marginTop="0dip"
android:layout_marginLeft="12dip"
android:gravity="left"
>
<TextView
@@ -120,7 +119,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
@@ -130,7 +129,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"
@@ -138,7 +137,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>