diff options
| -rw-r--r-- | core/java/android/pim/vcard/VCardComposer.java | 6 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_sim_pin_portrait.xml | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java index f9dce255056e..78075952937f 100644 --- a/core/java/android/pim/vcard/VCardComposer.java +++ b/core/java/android/pim/vcard/VCardComposer.java @@ -414,8 +414,10 @@ public class VCardComposer { appendVCardLine(builder, VCARD_PROPERTY_FULL_NAME, phoneName, needCharset, false); appendVCardLine(builder, VCARD_PROPERTY_NAME, phoneName, needCharset, false); - String label = Integer.toString(phonetype); - appendVCardTelephoneLine(builder, phonetype, label, phoneNumber); + if (!TextUtils.isEmpty(phoneNumber)) { + String label = Integer.toString(phonetype); + appendVCardTelephoneLine(builder, phonetype, label, phoneNumber); + } appendVCardLine(builder, VCARD_PROPERTY_END, VCARD_DATA_VCARD); diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml index ac404f26649b..45e96a3b4624 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml @@ -24,7 +24,7 @@ <LinearLayout android:id="@+id/topDisplayGroup" android:layout_width="fill_parent" - android:layout_height="115dip" + android:layout_height="wrap_content" android:layout_alignParentTop="true" android:orientation="vertical" > @@ -35,8 +35,9 @@ android:layout_height="wrap_content" android:layout_marginTop="9dip" android:gravity="center" + android:lines="2" android:textAppearance="?android:attr/textAppearanceLarge" - /> + /> <RelativeLayout android:layout_width="fill_parent" |