commit 857603964e936e1f0717b0d8bd0289e2b4c0c1cb
author Andrew Lee <anwlee@google.com> Tue Aug 19 23:32:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 19 21:23:09 2014 +0000
tree a9d330882ee5da601ce4a73a6016f8ef480249da
parent e78797f8dd02b209f24c0e9261e8cac81facf0b1
parent bd7a05650a9ba79ef29ac66908ea7146fe462cc8

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

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);