commit c9fdb6c618ad9b08f75b4cc6f6c56831ac661022
author Adrian Roos <roosa@google.com> Mon May 25 15:10:21 2015 -0700
committer Adrian Roos <roosa@google.com> Mon May 25 15:31:07 2015 -0700
tree afa5d5c8fb62761042ec374ec904aed0f98040b9
parent 6b1035b3c00d4b7da5bef61d7465f6b9d5cd8e89

Change emergency dialer FAB to correct size

Bug: 21300529
Change-Id: I869ecaf6bcc11f9c00b9b9322dc95355f7170293

res/layout/emergency_dialer.xml

diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index acb7033..01c2f80 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -121,8 +121,9 @@
 
         <ImageButton
             android:id="@+id/floating_action_button"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:background="@drawable/floating_action_button"
             android:contentDescription="@string/description_dial_button"
             android:src="@drawable/fab_ic_call"/>

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 93760d2..2e444e0 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -206,8 +206,7 @@
         } else {
             mDialButton.setVisibility(View.GONE);
         }
-        View floatingActionButtonContainer = findViewById(R.id.floating_action_button_container);
-        ViewUtil.setupFloatingActionButton(floatingActionButtonContainer, getResources());
+        ViewUtil.setupFloatingActionButton(mDialButton, getResources());
 
         if (icicle != null) {
             super.onRestoreInstanceState(icicle);