commit 040210f88bf7ede1382d4fc556496b825c96994e
author Andrew Lee <anwlee@google.com> Tue Aug 19 23:39:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 19 23:39:28 2014 +0000
tree 0f5afe3b46d7c38781a552273fd5c7e0a8631325
parent 5fc53d00405f259b9fab73fd12765dc7a3c5eff7
parent 857603964e936e1f0717b0d8bd0289e2b4c0c1cb

am 85760396: Merge "Pass in floating action button to controller." into lmp-dev

* commit '857603964e936e1f0717b0d8bd0289e2b4c0c1cb':
  Pass in floating action button to controller.

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 98512cd..36f7b8d 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -395,7 +395,7 @@
                 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);