commit a73e189f57d70e81e6c5150d10032dae29846fd7
author Andrew Lee <anwlee@google.com> Tue May 13 13:21:16 2014 -0700
committer Andrew Lee <anwlee@google.com> Tue May 13 14:14:57 2014 -0700
tree 724354b229d355c8594a3e991197ab643b481bb5
parent 7ff97a0c24daa15738d26c16367e122dfa6f7591

Use one ImageButton for the floating action button.

This means that the touch feedback transition can continue to
propagate, even while we're switching the icons.

Change-Id: Ia0c4e7bb4556c84cabccbda5f4c5861e25e2928f

res/layout/dialtacts_activity.xml

diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index 595eae1..e0049b5 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -79,28 +79,22 @@
         </LinearLayout>
     </com.android.dialer.list.RemoveView >
     <FrameLayout
-        android:layout_height="@dimen/floating_action_button_height"
+        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_marginRight="@dimen/floating_action_button_margin_right"
         android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
-        android:id="@+id/floating_action_button"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true">
+
         <ImageButton
-            android:id="@+id/dialpad_button"
-            android:background="@drawable/floating_action_button"
+            android:id="@+id/floating_action_button"
             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/fab_ic_dial"/>
-        <ImageButton
-            android:id="@+id/dial_button"
-            android:background="@drawable/floating_action_button"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:contentDescription="@string/description_dial_button"
-            android:src="@drawable/fab_ic_call"
-            android:visibility="gone" />
+
     </FrameLayout>
     <!-- Host container for the contact tile drag shadow -->
     <FrameLayout