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

Merge change I21eb4b87 into eclair-mr2

Browse Source 
* changes:
  Allow room for descenders in am/pm text.
This commit is contained in:
Android (Google) Code Review
2009-12-07 12:46:56 -08:00
parent 9d5b7aca74 21eb4b8735
commit 1b15acf705
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/carrier"
android:layout_marginBottom="10dip"
android:layout_marginTop="52dip"
android:layout_marginLeft="20dip"
>
@ -53,6 +52,8 @@
<TextView android:id="@+id/timeDisplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="none"
android:gravity="bottom"
android:textSize="72sp"
android:textAppearance="?android:attr/textAppearanceMedium"
@ -60,6 +61,7 @@
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="3.0"
android:layout_marginBottom="10dip"
/>
@ -67,10 +69,10 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="bottom"
android:textSize="22sp"
android:singleLine="true"
android:ellipsize="none"
android:textSize="22sp"
android:layout_marginLeft="8dip"
android:layout_marginBottom="-6dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000"
android:shadowDx="0"

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

@ -49,7 +49,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/carrier"
android:layout_marginBottom="8dip"
android:layout_marginTop="56dip"
>
@ -57,12 +56,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom"
android:singleLine="true"
android:ellipsize="none"
android:textSize="72sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="3.0"
android:layout_marginBottom="6dip"
/>
@ -70,10 +72,10 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="bottom"
android:textSize="22sp"
android:singleLine="true"
android:ellipsize="none"
android:textSize="22sp"
android:layout_marginLeft="8dip"
android:layout_marginBottom="-6dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000"
android:shadowDx="0"

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

@ -60,7 +60,6 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
>
@ -68,12 +67,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom"
android:singleLine="true"
android:ellipsize="none"
android:textSize="72sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="3.0"
android:layout_marginBottom="6dip"
/>
@ -81,10 +83,10 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="bottom"
android:textSize="22sp"
android:singleLine="true"
android:ellipsize="none"
android:textSize="22sp"
android:layout_marginLeft="8dip"
android:layout_marginBottom="-6dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000"
android:shadowDx="0"

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

@ -50,7 +50,6 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginTop="15dip"
android:layout_marginBottom="6dip"
android:layout_marginLeft="20dip"
>
@ -58,22 +57,25 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom"
android:singleLine="true"
android:ellipsize="none"
android:textSize="56sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="3.0"
android:layout_marginBottom="6dip"
/>
<TextView android:id="@+id/am_pm"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="bottom"
android:textSize="18sp"
android:singleLine="true"
android:ellipsize="none"
android:textSize="18sp"
android:layout_marginLeft="4dip"
android:layout_marginBottom="-6dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000"
android:shadowDx="0"