diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-19 23:57:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-19 23:57:59 +0000 |
commit | 77a70af447e86ca5f46e54cbd029a2d58d66030a (patch) | |
tree | e4ee5cbe49e136601570334e0a44fccada141142 | |
parent | 45f7fc96eea66ee1974cf40cc659586c36fa1bcc (diff) | |
parent | e40fc0c804d2b01e6bb0e712ab1ef81582a7a6f2 (diff) |
am e40fc0c8: am 040210f8: am 85760396: Merge "Pass in floating action button to controller." into lmp-dev
* commit 'e40fc0c804d2b01e6bb0e712ab1ef81582a7a6f2':
Pass in floating action button to controller.
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 98512cd52..36f7b8dfe 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -395,7 +395,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O R.dimen.floating_action_button_width); mFloatingActionButton.setOnClickListener(this); mFloatingActionButtonController = new FloatingActionButtonController(this, - floatingActionButtonContainer); + floatingActionButtonContainer, mFloatingActionButton); ImageButton optionsMenuButton = (ImageButton) searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button); |