diff options
Diffstat (limited to 'java/com/android/dialer/app/dialpad')
| -rw-r--r-- | java/com/android/dialer/app/dialpad/DialpadFragment.java | 11 | ||||
| -rw-r--r-- | java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java | 4 |
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(); } |