diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-05-06 17:24:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 17:24:22 -0700 |
| commit | ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd (patch) | |
| tree | 77430c7cffe9f966d645df05bfc97875da102284 | |
| parent | d6d115173a856fe28cf5a3087f6d7b0de77495c5 (diff) | |
| parent | 08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27 (diff) | |
| download | frameworks_base-ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd.zip frameworks_base-ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd.tar.gz frameworks_base-ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd.tar.bz2 | |
am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp
* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
Fix "p.m." in lockscreen (locale: es).
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 79ca617..200a1b2 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 8353887..23505c2 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 83381a1..b5cd442 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 8dacfaf..9ac0a47 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" |