From a5fd4d95805281c4d326062eedfd8079368ede55 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Tue, 10 Jul 2018 18:41:45 +0000
Subject: Revert "UI refresh for call log items."

This reverts commit 9c952d8f2688350f06d65df7852756ab05b6fdab.

Change-Id: I3b2f23826c34ecdb16e786c5dd92f13ed97d88e7
---
 .../app/calllog/CallLogListItemViewHolder.java     |  23 +-
 .../dialer/app/res/layout/call_log_fragment.xml    |   2 +
 .../dialer/app/res/layout/call_log_list_item.xml   | 240 +++++++++++----------
 java/com/android/dialer/app/res/values/dimens.xml  |   9 +-
 4 files changed, 127 insertions(+), 147 deletions(-)

(limited to 'java/com/android/dialer/app')

diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
index c95334695..e044460c5 100644
--- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
+++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
@@ -46,7 +46,6 @@ import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -365,8 +364,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
     PhoneCallDetailsHelper phoneCallDetailsHelper =
         new PhoneCallDetailsHelper(context, resources, callLogCache);
 
-    CardView cardView = new CardView(context);
-    cardView.setLayoutParams(new ViewGroup.MarginLayoutParams(0, 0));
     CallLogListItemViewHolder viewHolder =
         new CallLogListItemViewHolder(
             context,
@@ -381,7 +378,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
             new DialerQuickContactBadge(context),
             new View(context),
             PhoneCallDetailsViews.createForTest(context),
-            cardView,
+            new CardView(context),
             new TextView(context),
             new ImageView(context));
     viewHolder.detailsButtonView = new TextView(context);
@@ -892,30 +889,12 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
       bindActionButtons();
       actionsView.setVisibility(View.VISIBLE);
       actionsView.setAlpha(1.0f);
-      ViewGroup.MarginLayoutParams layoutParams =
-          (ViewGroup.MarginLayoutParams) callLogEntryView.getLayoutParams();
-      layoutParams.bottomMargin =
-          context
-              .getResources()
-              .getDimensionPixelSize(R.dimen.call_log_card_margin_bottom_expanded);
-      callLogEntryView.setLayoutParams(layoutParams);
-      callLogEntryView.setCardElevation(
-          context.getResources().getDimension(R.dimen.call_log_card_elevation_expanded));
     } else {
       // When recycling a view, it is possible the actionsView ViewStub was previously
       // inflated so we should hide it in this case.
       if (actionsView != null) {
         actionsView.setVisibility(View.GONE);
       }
-      ViewGroup.MarginLayoutParams layoutParams =
-          (ViewGroup.MarginLayoutParams) callLogEntryView.getLayoutParams();
-      layoutParams.bottomMargin =
-          context
-              .getResources()
-              .getDimensionPixelSize(R.dimen.call_log_card_margin_bottom_collapsed);
-      callLogEntryView.setLayoutParams(layoutParams);
-      callLogEntryView.setCardElevation(
-          context.getResources().getDimension(R.dimen.call_log_card_elevation_collapsed));
     }
 
     updatePrimaryActionButton(show);
diff --git a/java/com/android/dialer/app/res/layout/call_log_fragment.xml b/java/com/android/dialer/app/res/layout/call_log_fragment.xml
index 5ceff2eba..bf91a3a07 100644
--- a/java/com/android/dialer/app/res/layout/call_log_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_fragment.xml
@@ -62,6 +62,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
+    android:paddingStart="@dimen/call_log_horizontal_margin"
+    android:paddingEnd="@dimen/call_log_horizontal_margin"
     android:clipToPadding="false"/>
 
   <com.android.dialer.widget.EmptyContentView
diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item.xml b/java/com/android/dialer/app/res/layout/call_log_list_item.xml
index 5fbdf080b..c9c1a6739 100644
--- a/java/com/android/dialer/app/res/layout/call_log_list_item.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_list_item.xml
@@ -15,47 +15,48 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/call_log_list_item"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+  android:id="@+id/call_log_list_item"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
 
   <!-- Day group heading. Used to show a "today", "yesterday", "last week" or "other" heading
        above a group of call log entries. -->
   <TextView
-      android:id="@+id/call_log_day_group_label"
-      style="@style/Dialer.TextAppearance.OVERLINE.Ellipsize"
-      android:layout_width="wrap_content"
-      android:layout_height="48dp"
-      android:layout_marginStart="@dimen/call_log_start_margin"
-      android:layout_marginEnd="@dimen/call_log_outer_margin"
-      android:layout_gravity="start"
-      android:gravity="center_vertical"/>
+    android:id="@+id/call_log_day_group_label"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="start"
+    android:layout_marginStart="@dimen/call_log_start_margin"
+    android:layout_marginEnd="@dimen/call_log_outer_margin"
+    android:paddingTop="@dimen/call_log_day_group_padding_top"
+    android:paddingBottom="@dimen/call_log_day_group_padding_bottom"
+    style="@style/Dialer.TextAppearance.OVERLINE.Ellipsize"/>
 
   <android.support.v7.widget.CardView
-      android:id="@+id/call_log_row"
-      style="@style/CallLogCardStyle">
+    android:id="@+id/call_log_row"
+    style="@style/CallLogCardStyle">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
 
       <!-- Primary area containing the contact badge and caller information -->
       <LinearLayout
-          android:id="@+id/primary_action_view"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="@dimen/call_log_vertical_padding"
-          android:paddingBottom="@dimen/call_log_vertical_padding"
-          android:paddingStart="@dimen/call_log_start_margin"
-          android:paddingEnd="@dimen/call_log_outer_margin"
-          android:background="?android:attr/selectableItemBackground"
-          android:focusable="true"
-          android:gravity="center_vertical"
-          android:nextFocusLeft="@+id/quick_contact_photo"
-          android:nextFocusRight="@+id/call_back_action"
-          android:orientation="horizontal">
+        android:id="@+id/primary_action_view"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/call_log_start_margin"
+        android:paddingEnd="@dimen/call_log_outer_margin"
+        android:paddingTop="@dimen/call_log_vertical_padding"
+        android:paddingBottom="@dimen/call_log_vertical_padding"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:focusable="true"
+        android:nextFocusRight="@+id/call_back_action"
+        android:nextFocusLeft="@+id/quick_contact_photo">
 
         <FrameLayout
             android:layout_width="wrap_content"
@@ -67,103 +68,104 @@
               android:id="@+id/quick_contact_photo"
               android:layout_width="@dimen/contact_photo_size"
               android:layout_height="@dimen/contact_photo_size"
-              android:focusable="true"
-              android:nextFocusRight="@id/primary_action_view"/>
+              android:paddingTop="2dp"
+              android:nextFocusRight="@id/primary_action_view"
+              android:focusable="true"/>
 
           <ImageView
               android:id="@+id/quick_contact_checkbox"
+              android:scaleType="fitCenter"
               android:layout_width="@dimen/contact_photo_size"
               android:layout_height="@dimen/contact_photo_size"
-              android:scaleType="fitCenter"
-              android:src="@drawable/ic_check_mark_48dp"
-              android:visibility="gone"/>
+              android:visibility="gone"
+              android:src="@drawable/ic_check_mark_48dp" />
 
         </FrameLayout>
 
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginStart="@dimen/call_log_list_item_info_margin_start"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="vertical"
+          android:gravity="center_vertical"
+          android:layout_marginStart="@dimen/call_log_list_item_info_margin_start">
 
           <com.android.dialer.widget.BidiTextView
-              android:id="@+id/name"
-              style="@style/Dialer.TextAppearance.Primary.Ellipsize"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_marginBottom="@dimen/call_log_name_margin_bottom"
-              android:layout_marginEnd="@dimen/call_log_icon_margin"/>
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/call_log_name_margin_bottom"
+            android:layout_marginEnd="@dimen/call_log_icon_margin"
+            style="@style/Dialer.TextAppearance.Primary.Ellipsize"/>
 
           <LinearLayout
-              android:id="@+id/call_type"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal">
+            android:id="@+id/call_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
             <com.android.dialer.calllogutils.CallTypeIconsView
-                android:id="@+id/call_type_icons"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/call_log_icon_margin"
-                android:layout_gravity="center_vertical"/>
+              android:id="@+id/call_type_icons"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginEnd="@dimen/call_log_icon_margin"
+              android:layout_gravity="center_vertical"/>
 
             <ImageView
-                android:id="@+id/work_profile_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/call_log_icon_margin"
-                android:scaleType="center"
-                android:src="@drawable/ic_work_profile"
-                android:visibility="gone"/>
+              android:id="@+id/work_profile_icon"
+              android:src="@drawable/ic_work_profile"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginEnd="@dimen/call_log_icon_margin"
+              android:scaleType="center"
+              android:visibility="gone"/>
 
             <TextView
-                android:id="@+id/call_location_and_date"
-                style="Dialer.TextAppearance.Secondary.Ellipsize"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/call_log_icon_margin"
-                android:layout_gravity="center_vertical"/>
+              android:id="@+id/call_location_and_date"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginEnd="@dimen/call_log_icon_margin"
+              android:layout_gravity="center_vertical"
+              style="Dialer.TextAppearance.Secondary.Ellipsize"/>
 
           </LinearLayout>
 
           <TextView
-              android:id="@+id/call_account_label"
-              style="Dialer.TextAppearance.Secondary2.Ellipsize"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_marginTop="@dimen/call_log_call_account_margin_bottom"
-              android:layout_marginEnd="@dimen/call_log_icon_margin"
-              android:visibility="gone"/>
+            android:id="@+id/call_account_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/call_log_call_account_margin_bottom"
+            android:layout_marginEnd="@dimen/call_log_icon_margin"
+            android:visibility="gone"
+            style="Dialer.TextAppearance.Secondary2.Ellipsize"/>
 
           <LinearLayout
-              android:id="@+id/transcription"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginTop="@dimen/call_log_icon_margin"
-              android:orientation="vertical"
-              android:visibility="gone">
+            android:id="@+id/transcription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/call_log_icon_margin"
+            android:visibility="gone"
+            android:orientation="vertical">
 
             <TextView
-                android:id="@+id/voicemail_transcription"
-                style="Dialer.TextAppearance.Secondary2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:focusable="true"
-                android:nextFocusDown="@+id/voicemail_transcription_branding"
-                android:textIsSelectable="true"/>
+              android:id="@+id/voicemail_transcription"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:focusable="true"
+              android:nextFocusDown="@+id/voicemail_transcription_branding"
+              android:textIsSelectable="true"
+              style="Dialer.TextAppearance.Secondary2"/>
 
             <TextView
-                android:id="@+id/voicemail_transcription_branding"
-                style="Dialer.TextAppearance.Secondary2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="2dp"
-                android:focusable="true"
-                android:nextFocusDown="@+id/voicemail_transcription_rating"
-                android:nextFocusUp="@id/voicemail_transcription"/>
+              android:id="@+id/voicemail_transcription_branding"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:focusable="true"
+              android:nextFocusUp="@id/voicemail_transcription"
+              android:nextFocusDown="@+id/voicemail_transcription_rating"
+              android:paddingTop="2dp"
+              style="Dialer.TextAppearance.Secondary2"/>
 
             <LinearLayout
                 android:id="@+id/voicemail_transcription_rating"
@@ -171,38 +173,38 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/call_log_icon_margin"
                 android:layout_gravity="center_vertical"
+                android:visibility="gone"
                 android:paddingTop="2dp"
-                android:orientation="horizontal"
-                android:visibility="gone">
+                android:orientation="horizontal">
 
               <TextView
-                  android:id="@+id/voicemail_transcription_rating_text"
                   style="@style/TranscriptionQualityRating"
+                  android:id="@+id/voicemail_transcription_rating_text"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_weight="1"
-                  android:focusable="true"
                   android:gravity="start|center_vertical"
+                  android:focusable="true"
                   android:text="@string/voicemail_transcription_rating"/>
 
               <ImageView
-                  android:id="@+id/voicemail_transcription_rating_good"
                   style="@style/TranscriptionQualityRatingIcon"
+                  android:id="@+id/voicemail_transcription_rating_good"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:contentDescription="@string/description_rating_good"
-                  android:focusable="true"
                   android:gravity="end|center_vertical"
+                  android:focusable="true"
                   android:src="@drawable/quantum_ic_thumb_up_grey600_24"/>
 
               <ImageView
-                  android:id="@+id/voicemail_transcription_rating_bad"
                   style="@style/TranscriptionQualityRatingIcon"
+                  android:id="@+id/voicemail_transcription_rating_bad"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:contentDescription="@string/description_rating_bad"
-                  android:focusable="true"
                   android:gravity="end|center_vertical"
+                  android:focusable="true"
                   android:src="@drawable/quantum_ic_thumb_down_grey600_24"/>
 
             </LinearLayout>
@@ -212,25 +214,25 @@
         </LinearLayout>
 
         <ImageView
-            android:id="@+id/primary_action_button"
-            android:layout_width="@dimen/call_log_list_item_primary_action_dimen"
-            android:layout_height="@dimen/call_log_list_item_primary_action_dimen"
-            android:layout_gravity="center_vertical"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:scaleType="center"
-            android:tint="?colorIcon"
-            android:visibility="gone"/>
+          android:id="@+id/primary_action_button"
+          android:layout_width="@dimen/call_log_list_item_primary_action_dimen"
+          android:layout_height="@dimen/call_log_list_item_primary_action_dimen"
+          android:layout_gravity="center_vertical"
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:scaleType="center"
+          android:tint="?colorIcon"
+          android:visibility="gone"/>
 
       </LinearLayout>
 
       <!-- Viewstub with additional expandable actions for a call log entry -->
       <ViewStub
-          android:id="@+id/call_log_entry_actions_stub"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_gravity="bottom"
-          android:inflatedId="@+id/call_log_entry_actions"
-          android:layout="@layout/call_log_list_item_actions"/>
+        android:id="@+id/call_log_entry_actions_stub"
+        android:inflatedId="@+id/call_log_entry_actions"
+        android:layout="@layout/call_log_list_item_actions"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"/>
 
     </LinearLayout>
 
diff --git a/java/com/android/dialer/app/res/values/dimens.xml b/java/com/android/dialer/app/res/values/dimens.xml
index 7a1f574ae..fdbcac93a 100644
--- a/java/com/android/dialer/app/res/values/dimens.xml
+++ b/java/com/android/dialer/app/res/values/dimens.xml
@@ -29,12 +29,9 @@
   <dimen name="select_all_text_left_padding">18dp</dimen>
 
   <!-- Call Log -->
-  <dimen name="call_log_outer_margin">16dp</dimen>
-  <dimen name="call_log_start_margin">16dp</dimen>
-  <dimen name="call_log_card_elevation_expanded">6dp</dimen>
-  <dimen name="call_log_card_elevation_collapsed">0dp</dimen>
-  <dimen name="call_log_card_margin_bottom_expanded">10dp</dimen>
-  <dimen name="call_log_card_margin_bottom_collapsed">4dp</dimen>
+  <dimen name="call_log_horizontal_margin">8dp</dimen>
+  <dimen name="call_log_outer_margin">8dp</dimen>
+  <dimen name="call_log_start_margin">8dp</dimen>
   <dimen name="call_log_name_margin_bottom">2dp</dimen>
   <dimen name="call_log_call_account_margin_bottom">2dp</dimen>
   <dimen name="call_log_vertical_padding">8dp</dimen>
-- 
cgit v1.2.3