diff options
| author | Andrew Lee <anwlee@google.com> | 2014-08-19 23:32:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 21:23:09 +0000 |
| commit | 857603964e936e1f0717b0d8bd0289e2b4c0c1cb (patch) | |
| tree | a9d330882ee5da601ce4a73a6016f8ef480249da /src | |
| parent | e78797f8dd02b209f24c0e9261e8cac81facf0b1 (diff) | |
| parent | bd7a05650a9ba79ef29ac66908ea7146fe462cc8 (diff) | |
Merge "Pass in floating action button to controller." into lmp-dev
Diffstat (limited to 'src')
| -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); |