Update Dialer source from latest green build.

* Refactor voicemail component
* Add new enriched calling components

Test: treehugger, manual aosp testing

Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942

6 files changed, 42 insertions, 177 deletions

diff --git a/java/com/android/dialer/app/res/layout/call_detail.xml b/java/com/android/dialer/app/res/layout/call_detail.xml
deleted file mode 100644
index 58a7bf0dc..000000000
--- a/java/com/android/dialer/app/res/layout/call_detail.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/call_detail"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@color/background_dialer_call_log">
-
-  <!--
-    The list view is under everything.
-    It contains a first header element which is hidden under the controls UI.
-    When scrolling, the controls move up until the name bar hits the top.
-    -->
-  <ListView
-    android:id="@+id/history"
-    android:layout_width="match_parent"
-    android:layout_height="fill_parent"/>
-
-</FrameLayout>
diff --git a/java/com/android/dialer/app/res/layout/call_detail_footer.xml b/java/com/android/dialer/app/res/layout/call_detail_footer.xml
deleted file mode 100644
index 57713448e..000000000
--- a/java/com/android/dialer/app/res/layout/call_detail_footer.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical">
-
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/divider_line_thickness"
-    android:background="@color/call_log_action_divider"/>
-
-  <TextView
-    android:id="@+id/call_detail_action_copy"
-    style="@style/CallDetailActionItemStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:drawableStart="@drawable/ic_call_detail_content_copy"
-    android:text="@string/action_copy_number_text"/>
-
-  <TextView
-    android:id="@+id/call_detail_action_edit_before_call"
-    style="@style/CallDetailActionItemStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:drawableStart="@drawable/ic_call_detail_edit"
-    android:text="@string/action_edit_number_before_call"
-    android:visibility="gone"/>
-
-  <TextView
-    android:id="@+id/call_detail_action_report"
-    style="@style/CallDetailActionItemStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:drawableStart="@drawable/ic_call_detail_report"
-    android:text="@string/action_report_number"
-    android:visibility="gone"/>
-
-</LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/call_detail_header.xml b/java/com/android/dialer/app/res/layout/call_detail_header.xml
deleted file mode 100644
index fd85f0af1..000000000
--- a/java/com/android/dialer/app/res/layout/call_detail_header.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/caller_information"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:paddingTop="@dimen/call_detail_top_margin"
-  android:paddingBottom="@dimen/call_detail_bottom_margin"
-  android:paddingStart="@dimen/call_detail_horizontal_margin"
-  android:background="@color/background_dialer_white"
-  android:baselineAligned="false"
-  android:elevation="@dimen/call_detail_elevation"
-  android:focusable="true"
-  android:orientation="horizontal">
-
-  <QuickContactBadge
-    android:id="@+id/quick_contact_photo"
-    android:layout_width="@dimen/contact_photo_size"
-    android:layout_height="@dimen/contact_photo_size"
-    android:layout_marginTop="3dp"
-    android:layout_alignParentStart="true"
-    android:layout_gravity="top"
-    android:focusable="true"/>
-
-  <LinearLayout
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_marginStart="@dimen/call_detail_horizontal_margin"
-    android:gravity="center_vertical"
-    android:orientation="vertical">
-
-    <TextView
-      android:id="@+id/caller_name"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="2dp"
-      android:layout_marginBottom="3dp"
-      android:includeFontPadding="false"
-      android:singleLine="true"
-      android:textColor="?android:textColorPrimary"
-      android:textSize="@dimen/call_log_primary_text_size"/>
-
-    <TextView
-      android:id="@+id/caller_number"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="1dp"
-      android:singleLine="true"
-      android:textColor="?android:textColorSecondary"
-      android:textSize="@dimen/call_log_detail_text_size"/>
-
-    <TextView
-      android:id="@+id/phone_account_label"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:singleLine="true"
-      android:textColor="?android:textColorSecondary"
-      android:textSize="@dimen/call_log_detail_text_size"
-      android:visibility="gone"/>
-
-  </LinearLayout>
-
-  <ImageView
-    android:id="@+id/call_back_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_marginEnd="4dp"
-    android:background="?android:attr/selectableItemBackgroundBorderless"
-    android:contentDescription="@string/description_call_log_call_action"
-    android:scaleType="center"
-    android:src="@drawable/ic_call_24dp"
-    android:tint="@color/call_log_list_item_primary_action_icon_tint"
-    android:visibility="gone"/>
-
-</LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/call_detail_history_item.xml b/java/com/android/dialer/app/res/layout/call_detail_history_item.xml
index 5958ee81c..0184a42f2 100644
--- a/java/com/android/dialer/app/res/layout/call_detail_history_item.xml
+++ b/java/com/android/dialer/app/res/layout/call_detail_history_item.xml
@@ -27,9 +27,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
-    <view
+    <com.android.dialer.calllogutils.CallTypeIconsView
       android:id="@+id/call_type_icon"
-      class="com.android.dialer.app.calllog.CallTypeIconsView"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"/>
diff --git a/java/com/android/dialer/app/res/layout/call_log_activity.xml b/java/com/android/dialer/app/res/layout/call_log_activity.xml
new file mode 100644
index 000000000..4e2b1887c
--- /dev/null
+++ b/java/com/android/dialer/app/res/layout/call_log_activity.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/calllog_frame"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+  <com.android.contacts.common.list.ViewPagerTabs
+    android:id="@+id/viewpager_header"
+    style="@style/DialtactsActionBarTabTextStyle"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/tab_height"
+    android:layout_gravity="top"
+    android:elevation="@dimen/tab_elevation"
+    android:orientation="horizontal"
+    android:textAllCaps="true"/>
+  <android.support.v4.view.ViewPager
+    android:id="@+id/call_log_pager"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1"/>
+  <RelativeLayout
+    android:id="@+id/floating_action_button_container"
+    android:layout_width="0dp"
+    android:layout_height="0dp"/>
+</LinearLayout>
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 c22ac861d..1592aa928 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
@@ -93,8 +93,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <view
-              class="com.android.dialer.app.calllog.CallTypeIconsView"
+            <com.android.dialer.calllogutils.CallTypeIconsView
               android:id="@+id/call_type_icons"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"