drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jim Miller
2009-11-24 14:31:37 -08:00
parent e982185f34 a442e79126
commit f8da578ee7
1 changed files with 113 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/res/res/layout/keyguard_screen_tab_unlock.xml
View File

@ -21,17 +21,13 @@
state of the device, as well as instructions on how to get past it
depending on the state of the device. It is the same for landscape
and portrait.-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/root">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#70000000"
android:gravity="center_horizontal">
android:gravity="center_horizontal"
android:id="@+id/root">
<TextView
android:id="@+id/carrier"
@ -39,8 +35,8 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_marginTop="16dip"
android:layout_marginRight="16dip"
android:layout_marginTop="10dip"
android:layout_marginRight="8dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@ -49,9 +45,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/carrier"
android:layout_marginBottom="8dip"
android:layout_marginTop="16dip"
android:layout_marginLeft="24dip"
android:layout_marginBottom="10dip"
android:layout_marginTop="52dip"
android:layout_marginLeft="20dip"
>
<TextView android:id="@+id/timeDisplay"
@ -98,7 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/date"
android:layout_marginTop="6dip"
android:layout_marginTop="4dip"
android:layout_marginLeft="24dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:drawablePadding="4dip"
@ -109,7 +105,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/status1"
android:layout_marginTop="6dip"
android:layout_marginTop="4dip"
android:layout_marginLeft="24dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:drawablePadding="4dip"
@ -147,4 +143,3 @@
</RelativeLayout>
</FrameLayout>