Minor polish and bugfixes for new call log.

-Reuse the adapter in NewCallLogFragment to maintain position in call log when returning from call details
-Convert empty values to null when invoking ContactPhotoManager to make photos appear correctly in new call log bottom sheets
-Added CallLogContactTypes to be shared between proper call log and bottom sheets
-Fixed vertical alignment in bottom sheet when there was no secondary text
-Added some verbose logging

Test: unit and manual
PiperOrigin-RevId: 181655715
Change-Id: I9c1a42ad8d529ee2327e15fcc1d32b7b83982014

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