diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-07 12:46:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-07 12:46:56 -0800 |
| commit | 1b15acf705a6bcca333b1e8a6a48039242cc7d57 (patch) | |
| tree | 28399a91848517f500779bfd02153fd378fc2e5e | |
| parent | 9d5b7aca742f44e4b16db66a4a372eb71325470f (diff) | |
| parent | 21eb4b87357de7f276eb3ff97c9e91e06568f7af (diff) | |
| download | frameworks_base-1b15acf705a6bcca333b1e8a6a48039242cc7d57.zip frameworks_base-1b15acf705a6bcca333b1e8a6a48039242cc7d57.tar.gz frameworks_base-1b15acf705a6bcca333b1e8a6a48039242cc7d57.tar.bz2 | |
Merge change I21eb4b87 into eclair-mr2
* changes:
Allow room for descenders in am/pm text.
4 files changed, 20 insertions, 12 deletions
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index f8944b5..a45faad 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -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" 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 22c0b8e..1001697 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -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" diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index 602a37c..f8f326a 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -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" diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index 9ce5a25..d7c4aae 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -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" |