Revert "Update AOSP Dialer source from internal google3 repository at cl/150622237"

This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.

Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6

2 files changed, 11 insertions, 23 deletions

diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
index 3f2ba7534..7f8bb8087 100644
--- a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
+++ b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
@@ -16,30 +16,29 @@
   -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/call_entry_padding">
 
-  <com.android.dialer.calllogutils.CallTypeIconsView
+  <ImageView
       android:id="@+id/call_direction"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
+      android:layout_width="@dimen/call_entry_icon_size"
+      android:layout_height="@dimen/call_entry_icon_size"
       android:layout_marginStart="@dimen/call_entry_padding"
-      app:useLargeIcons="true"/>
+      android:layout_marginEnd="@dimen/call_entry_left_margin"/>
 
   <TextView
       android:id="@+id/call_type"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/call_entry_text_left_margin"
+      android:layout_toEndOf="@+id/call_direction"
       style="@style/PrimaryText"/>
 
   <TextView
       android:id="@+id/call_time"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/call_entry_text_left_margin"
+      android:layout_toEndOf="@id/call_direction"
       android:layout_below="@+id/call_type"
       android:layout_marginBottom="@dimen/call_entry_bottom_padding"
       style="@style/SecondaryText"/>
@@ -57,29 +56,18 @@
       android:id="@+id/ec_container"
       android:layout_height="@dimen/ec_container_height"
       android:layout_width="match_parent"
-      android:layout_marginStart="@dimen/call_entry_text_left_margin"
+      android:layout_marginStart="@dimen/ec_text_left_margin"
       android:layout_below="@+id/call_time"
       android:visibility="gone"/>
 
-  <TextView
-      android:id="@+id/post_call_note"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/ec_container_height"
-      android:gravity="center_vertical"
-      android:layout_marginStart="@dimen/ec_post_call_left_margin"
-      android:maxLines="2"
-      android:visibility="gone"
-      android:layout_below="@+id/ec_container"
-      style="@style/SecondaryText"/>
-
   <View
       android:id="@+id/divider"
       android:layout_width="match_parent"
       android:layout_height="1dp"
-      android:layout_below="@id/post_call_note"
+      android:layout_below="@id/ec_container"
       android:layout_marginTop="@dimen/ec_divider_top_bottom_margin"
       android:layout_marginBottom="@dimen/ec_divider_top_bottom_margin"
-      android:layout_marginStart="@dimen/call_entry_text_left_margin"
+      android:layout_marginStart="@dimen/ec_text_left_margin"
       android:background="#12000000"
       android:visibility="gone"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/values/dimens.xml b/java/com/android/dialer/calldetails/res/values/dimens.xml
index 2ca7ea83a..59f237103 100644
--- a/java/com/android/dialer/calldetails/res/values/dimens.xml
+++ b/java/com/android/dialer/calldetails/res/values/dimens.xml
@@ -29,12 +29,12 @@
   <dimen name="call_entry_icon_size">24dp</dimen>
   <dimen name="call_entry_padding">16dp</dimen>
   <dimen name="call_entry_bottom_padding">14dp</dimen>
-  <dimen name="call_entry_text_left_margin">72dp</dimen>
+  <dimen name="call_entry_left_margin">32dp</dimen>
 
   <!-- EC container -->
   <dimen name="call_details_ec_text_size">12sp</dimen>
   <dimen name="ec_container_height">48dp</dimen>
-  <dimen name="ec_post_call_left_margin">73dp</dimen>
+  <dimen name="ec_text_left_margin">72dp</dimen>
   <dimen name="ec_photo_size">40dp</dimen>
   <dimen name="ec_divider_top_bottom_margin">8dp</dimen>
 </resources>
\ No newline at end of file