diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-28 18:11:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 18:11:25 +0000 |
| commit | e10dd05600d2d7f71163ea29c7cecb4bf70cfaab (patch) | |
| tree | a9e7f3450c6125b27d015fa6a0f7a163d4535c87 /src | |
| parent | 547661c110e349f2978761ac29d32f4d7b4e7df0 (diff) | |
| parent | 052597e2ffd41c9345e0ea6573c80eb880b13667 (diff) | |
am 052597e2: am e32de99b: am 0fc67af1: am ed058349: Merge "Fix bug in FAB action" into mnc-dev
* commit '052597e2ffd41c9345e0ea6573c80eb880b13667':
Fix bug in FAB action
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 98f34b57d..69cc14673 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -608,7 +608,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O public void onClick(View view) { switch (view.getId()) { case R.id.floating_action_button: - if (mListsFragment.getCurrentTabIndex() == ListsFragment.TAB_INDEX_ALL_CONTACTS) { + if (mListsFragment.getCurrentTabIndex() + == ListsFragment.TAB_INDEX_ALL_CONTACTS && !mInRegularSearch) { DialerUtils.startActivityWithErrorToast( this, IntentUtil.getNewContactIntent(), |