From 77491f01a3c77dd8903a0b454c83d4212377448f Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Thu, 6 May 2010 16:15:49 -0400
Subject: [PATCH] Fix "p.m." in lockscreen (locale: es).

Use padding instead of margin in DigitalClock's
RelativeLayout params to ensure @id/am_pm's descenders
aren't clipped.

Bug: 2277477
Change-Id: I9c8ef0c60e8ac0d2f969de97e8bfe146553ac379
---
 core/res/res/layout/keyguard_screen_tab_unlock.xml       | 2 +-
 core/res/res/layout/keyguard_screen_tab_unlock_land.xml  | 2 +-
 core/res/res/layout/keyguard_screen_unlock_landscape.xml | 2 +-
 core/res/res/layout/keyguard_screen_unlock_portrait.xml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml
index 79ca6174cc7d8..200a1b294c0b3 100644
--- 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
index 8353887b4f10d..23505c2699d87 100644
--- 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
index 83381a1913c77..b5cd4424c63b2 100644
--- 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
index 8dacfaf8d068a..9ac0a471af84f 100644
--- 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"