Update AOSP Dialer source from internal google3 repository at

cl/150622237

Test: make, treehugger, on device testing.

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150392808 (3/16/2017) to cl/150622237 (3/20/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: Id53e0e580a4ef73760a8afb7bb8c265ee27ad535

2 files changed, 6 insertions, 9 deletions

diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java
index 4785ab16f..80be8fe05 100644
--- a/java/com/android/dialer/app/dialpad/DialpadFragment.java
+++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java
@@ -42,6 +42,7 @@ import android.provider.Contacts.Phones;
 import android.provider.Contacts.PhonesColumns;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
@@ -63,7 +64,6 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.PopupMenu;
@@ -405,14 +405,11 @@ public class DialpadFragment extends Fragment
     mDialpadChooser = (ListView) fragmentView.findViewById(R.id.dialpadChooser);
     mDialpadChooser.setOnItemClickListener(this);
 
-    final View floatingActionButtonContainer =
-        fragmentView.findViewById(R.id.dialpad_floating_action_button_container);
-    final ImageButton floatingActionButton =
-        (ImageButton) fragmentView.findViewById(R.id.dialpad_floating_action_button);
+    FloatingActionButton floatingActionButton =
+        (FloatingActionButton) fragmentView.findViewById(R.id.dialpad_floating_action_button);
     floatingActionButton.setOnClickListener(this);
     mFloatingActionButtonController =
-        new FloatingActionButtonController(
-            getActivity(), floatingActionButtonContainer, floatingActionButton);
+        new FloatingActionButtonController(getActivity(), floatingActionButton);
     Trace.endSection();
     Trace.endSection();
     return fragmentView;
diff --git a/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java b/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java
index 2ffacb6d8..be2964dfe 100644
--- a/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java
+++ b/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java
@@ -65,7 +65,7 @@ public class PseudoEmergencyAnimator {
                 ColorFilter colorFilter = new LightingColorFilter(Color.BLACK, color);
 
                 View floatingActionButtonContainer =
-                    getView().findViewById(R.id.dialpad_floating_action_button_container);
+                    getView().findViewById(R.id.floating_action_button);
                 if (floatingActionButtonContainer != null) {
                   floatingActionButtonContainer.getBackground().setColorFilter(colorFilter);
                 }
@@ -96,7 +96,7 @@ public class PseudoEmergencyAnimator {
             public void onAnimationEnd(Animator animation) {
               try {
                 View floatingActionButtonContainer =
-                    getView().findViewById(R.id.dialpad_floating_action_button_container);
+                    getView().findViewById(R.id.floating_action_button);
                 if (floatingActionButtonContainer != null) {
                   floatingActionButtonContainer.getBackground().clearColorFilter();
                 }