Merge "Fix "p.m." in lockscreen (locale: es)." into froyo

dsandler · Android (Google) Code Review · commit 08e1b94c5c06 · 2010-05-06T17:23:03.000-07:00
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml
@@ -65,7 +65,7 @@
         android:layout_below="@id/carrier"
         android:layout_marginTop="52dip"
         android:layout_marginLeft="20dip"
-        android:layout_marginBottom="8dip"
+        android:paddingBottom="8dip"
         >
 
         <TextView android:id="@+id/timeDisplay"
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml
@@ -66,7 +66,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/carrier"
             android:layout_marginTop="56dip"
-            android:layout_marginBottom="8dip"
+            android:paddingBottom="8dip"
             >
 
             <TextView android:id="@+id/timeDisplay"
diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml
@@ -65,7 +65,7 @@
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
             android:layout_marginTop="8dip"
-            android:layout_marginBottom="8dip"
+            android:paddingBottom="8dip"
             >
 
             <TextView android:id="@+id/timeDisplay"
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
@@ -55,7 +55,7 @@
             android:layout_alignParentTop="true"
             android:layout_marginTop="15dip"
             android:layout_marginLeft="20dip"
-            android:layout_marginBottom="8dip"
+            android:paddingBottom="8dip"
             >
 
             <TextView android:id="@+id/timeDisplay"

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`android:layout_below="@id/carrier"`
`66`	`66`	`android:layout_marginTop="52dip"`
`67`	`67`	`android:layout_marginLeft="20dip"`
`68`		`- android:layout_marginBottom="8dip"`
	`68`	`+ android:paddingBottom="8dip"`
`69`	`69`	`>`
`70`	`70`
`71`	`71`	`<TextView android:id="@+id/timeDisplay"`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`android:layout_height="wrap_content"`
`67`	`67`	`android:layout_below="@id/carrier"`
`68`	`68`	`android:layout_marginTop="56dip"`
`69`		`- android:layout_marginBottom="8dip"`
	`69`	`+ android:paddingBottom="8dip"`
`70`	`70`	`>`
`71`	`71`
`72`	`72`	`<TextView android:id="@+id/timeDisplay"`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`android:layout_alignParentTop="true"`
`56`	`56`	`android:layout_marginTop="15dip"`
`57`	`57`	`android:layout_marginLeft="20dip"`
`58`		`- android:layout_marginBottom="8dip"`
	`58`	`+ android:paddingBottom="8dip"`
`59`	`59`	`>`
`60`	`60`
`61`	`61`	`<TextView android:id="@+id/timeDisplay"`