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

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

Browse Source 
Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp

* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
  Fix "p.m." in lockscreen (locale: es).
This commit is contained in:
Daniel Sandler
2010-05-06 17:24:22 -07:00
committed by Android Git Automerger
parent d6d115173a 08e1b94c5c
commit ad2f9ff786
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@
android:layout_below="@id/carrier" android:layout_below="@id/carrier"
android:layout_marginTop="52dip" android:layout_marginTop="52dip"
android:layout_marginLeft="20dip" android:layout_marginLeft="20dip"
android:layout_marginBottom="8dip" android:paddingBottom="8dip"
> >
<TextView android:id="@+id/timeDisplay" <TextView android:id="@+id/timeDisplay"

2
core/res/res/layout/keyguard_screen_tab_unlock_land.xml
View File

@@ -66,7 +66,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/carrier" android:layout_below="@id/carrier"
android:layout_marginTop="56dip" android:layout_marginTop="56dip"
android:layout_marginBottom="8dip" android:paddingBottom="8dip"
> >
<TextView android:id="@+id/timeDisplay" <TextView android:id="@+id/timeDisplay"

2
core/res/res/layout/keyguard_screen_unlock_landscape.xml
View File

@@ -65,7 +65,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:layout_marginBottom="8dip" android:paddingBottom="8dip"
> >
<TextView android:id="@+id/timeDisplay" <TextView android:id="@+id/timeDisplay"

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

@@ -55,7 +55,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="15dip" android:layout_marginTop="15dip"
android:layout_marginLeft="20dip" android:layout_marginLeft="20dip"
android:layout_marginBottom="8dip" android:paddingBottom="8dip"
> >
<TextView android:id="@+id/timeDisplay" <TextView android:id="@+id/timeDisplay"