From 30ccc4f3aa6da94f0bb8a01a880a6353b883b263 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 20 Mar 2017 20:40:36 +0000
Subject: Revert "Update AOSP Dialer source from internal google3 repository at
 cl/150622237"

This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.

Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6
---
 .../dialer/app/res/layout/dialtacts_activity.xml   | 25 ++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'java/com/android/dialer/app/res/layout/dialtacts_activity.xml')

diff --git a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
index 958b6944b..042b4a5e8 100644
--- a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
+++ b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
@@ -38,17 +38,24 @@
       android:clipChildren="false"/>
   </FrameLayout>
 
-  <android.support.design.widget.FloatingActionButton
+  <FrameLayout
+    android:id="@+id/floating_action_button_container"
+    android:layout_width="@dimen/floating_action_button_width"
+    android:layout_height="@dimen/floating_action_button_height"
+    android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+    android:layout_gravity="center_horizontal|bottom"
+    android:background="@drawable/dialer_fab"
+    app:layout_behavior="com.android.dialer.app.FloatingActionButtonBehavior">
+
+    <ImageButton
       android:id="@+id/floating_action_button"
-      android:layout_width="@dimen/floating_action_button_width"
-      android:layout_height="@dimen/floating_action_button_height"
-      android:layout_gravity="center_horizontal|bottom"
-      android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="@drawable/floating_action_button"
       android:contentDescription="@string/action_menu_dialpad_button"
-      android:src="@drawable/quantum_ic_dialpad_white_24"
-      android:scaleType="center"
-      app:elevation="@dimen/floating_action_button_translation_z"
-      app:backgroundTint="@color/dialer_secondary_color"/>
+      android:src="@drawable/fab_ic_dial"/>
+
+  </FrameLayout>
 
   <!-- Host container for the contact tile drag shadow -->
   <FrameLayout
-- 
cgit v1.2.3