diff options
Diffstat (limited to 'java/com/android/dialer/contactactions')
| -rw-r--r-- | java/com/android/dialer/contactactions/ContactActionBottomSheet.java | 4 | ||||
| -rw-r--r-- | java/com/android/dialer/contactactions/res/layout/contact_layout.xml | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java index f2f1d189b..7e216aaa1 100644 --- a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java +++ b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java @@ -89,9 +89,9 @@ public class ContactActionBottomSheet extends BottomSheetDialog implements OnCli ContactPhotoManager.getInstance(getContext()) .loadDialerThumbnailOrPhoto( contactView.findViewById(R.id.quick_contact_photo), - photoInfo.lookupUri() != null ? Uri.parse(photoInfo.lookupUri()) : null, + !TextUtils.isEmpty(photoInfo.lookupUri()) ? Uri.parse(photoInfo.lookupUri()) : null, photoInfo.photoId(), - photoInfo.photoUri() != null ? Uri.parse(photoInfo.photoUri()) : null, + !TextUtils.isEmpty(photoInfo.photoUri()) ? Uri.parse(photoInfo.photoUri()) : null, photoInfo.displayName(), photoInfo.contactType()); diff --git a/java/com/android/dialer/contactactions/res/layout/contact_layout.xml b/java/com/android/dialer/contactactions/res/layout/contact_layout.xml index 8ea05d4d6..4deef3e07 100644 --- a/java/com/android/dialer/contactactions/res/layout/contact_layout.xml +++ b/java/com/android/dialer/contactactions/res/layout/contact_layout.xml @@ -15,12 +15,13 @@ ~ limitations under the License --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="8dp" android:layout_marginBottom="12dp" - android:layout_marginEnd="8dp"> + android:layout_marginEnd="8dp" + android:gravity="center_vertical" + android:orientation="horizontal"> <QuickContactBadge android:id="@+id/quick_contact_photo" @@ -32,22 +33,22 @@ android:focusable="true"/> <LinearLayout - android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:orientation="vertical"> <TextView android:id="@+id/primary_text" + style="@style/PrimaryText" android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/PrimaryText"/> + android:layout_height="wrap_content"/> <TextView android:id="@+id/secondary_text" + style="@style/SecondaryText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="2dp" - style="@style/SecondaryText"/> + android:layout_marginTop="2dp"/> </LinearLayout> </LinearLayout>
\ No newline at end of file |