commit 14462b65dee767d897219d685d41357c9b78c33f
author Sai Cheemalapati <saicheems@google.com> Wed Jun 18 13:53:56 2014 -0700
committer Sai Cheemalapati <saicheems@google.com> Fri Jun 20 15:34:03 2014 -0700
tree 66c4adb629e11cb43e348b1ebb46df1fab0afa86
parent f8a8854eeb749bee419144ab8076aa75119017be

Update Emergency Dialer to match Dialer (6/7).

Emergency dialer style updated to match style in Dialer and
InCallUI.
Moved all dialpad resources to PhoneCommon.

Change-Id: Id68e48c63fade3138c3fd5ede9c4e55b5f5b9da1

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 772cce9..8d4521f 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -44,6 +44,7 @@
 import android.widget.EditText;
 
 import com.android.phone.common.HapticFeedback;
+import com.android.phone.common.util.ViewUtil;
 
 
 /**
@@ -192,7 +193,7 @@
         mDelete.setOnClickListener(this);
         mDelete.setOnLongClickListener(this);
 
-        mDialButton = findViewById(R.id.dialButton);
+        mDialButton = findViewById(R.id.floating_action_button);
 
         // Check whether we should show the onscreen "Dial" button and co.
         Resources res = getResources();
@@ -201,6 +202,8 @@
         } else {
             mDialButton.setVisibility(View.GONE);
         }
+        View floatingActionButtonContainer = findViewById(R.id.floating_action_button_container);
+        ViewUtil.setupFloatingActionButton(floatingActionButtonContainer, getResources());
 
         if (icicle != null) {
             super.onRestoreInstanceState(icicle);
@@ -405,7 +408,7 @@
                 keyPressed(KeyEvent.KEYCODE_DEL);
                 return;
             }
-            case R.id.dialButton: {
+            case R.id.floating_action_button: {
                 mHaptic.vibrate();  // Vibrate here too, just like we do for the regular keys
                 placeCall();
                 return;
@@ -632,7 +635,6 @@
     private void updateDialAndDeleteButtonStateEnabledAttr() {
         final boolean notEmpty = mDigits.length() != 0;
 
-        mDialButton.setEnabled(notEmpty);
         mDelete.setEnabled(notEmpty);
     }
 }