diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-03-20 20:40:36 +0000 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-03-20 20:40:36 +0000 |
| commit | 30ccc4f3aa6da94f0bb8a01a880a6353b883b263 (patch) | |
| tree | 2f55365aaf87df9ba7c1fe0be56a7d0988eadf30 /java/com/android/dialer/app/dialpad/DialpadFragment.java | |
| parent | 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd (diff) | |
Revert "Update AOSP Dialer source from internal google3 repository at cl/150622237"
This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.
Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6
Diffstat (limited to 'java/com/android/dialer/app/dialpad/DialpadFragment.java')
| -rw-r--r-- | java/com/android/dialer/app/dialpad/DialpadFragment.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java index 80be8fe05..4785ab16f 100644 --- a/java/com/android/dialer/app/dialpad/DialpadFragment.java +++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java @@ -42,7 +42,6 @@ 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; @@ -64,6 +63,7 @@ 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,11 +405,14 @@ public class DialpadFragment extends Fragment mDialpadChooser = (ListView) fragmentView.findViewById(R.id.dialpadChooser); mDialpadChooser.setOnItemClickListener(this); - FloatingActionButton floatingActionButton = - (FloatingActionButton) fragmentView.findViewById(R.id.dialpad_floating_action_button); + 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.setOnClickListener(this); mFloatingActionButtonController = - new FloatingActionButtonController(getActivity(), floatingActionButton); + new FloatingActionButtonController( + getActivity(), floatingActionButtonContainer, floatingActionButton); Trace.endSection(); Trace.endSection(); return fragmentView; |