diff options
| author | sail <sail@google.com> | 2016-10-17 20:11:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-17 20:11:58 +0000 |
| commit | cbe0b39ab3060e8d5006998542d97053bbce58f4 (patch) | |
| tree | 09a246c819288bf151cb1feccc06b8837e9d9a8c /src | |
| parent | 40cd14f3e6b415c90906be0f34fcc8c5b7e730a3 (diff) | |
| parent | 4fb68ffaa18013d7440d973e743315c1ee0d01c5 (diff) | |
Merge "Fixed Dial fab changed to add to contact when multiwindow mode" am: d1be0b9328
am: 4fb68ffaa1
Change-Id: I6f73b3e6a9b40a435276581db0f5376c1a0ca7b9
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index d063fef5a..441501cfd 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -627,7 +627,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O int resId = view.getId(); if (resId == R.id.floating_action_button) { if (mListsFragment.getCurrentTabIndex() - == ListsFragment.TAB_INDEX_ALL_CONTACTS && !mInRegularSearch) { + == ListsFragment.TAB_INDEX_ALL_CONTACTS && !mInRegularSearch && + !mInDialpadSearch) { DialerUtils.startActivityWithErrorToast( this, IntentUtil.getNewContactIntent(), @@ -1342,7 +1343,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O updateMissedCalls(); int tabIndex = mListsFragment.getCurrentTabIndex(); mPreviouslySelectedTabIndex = tabIndex; - if (tabIndex == ListsFragment.TAB_INDEX_ALL_CONTACTS) { + if (tabIndex == ListsFragment.TAB_INDEX_ALL_CONTACTS && + !mInRegularSearch && !mInDialpadSearch) { mFloatingActionButtonController.changeIcon( getResources().getDrawable(R.drawable.ic_person_add_24dp), getResources().getString(R.string.search_shortcut_create_new_contact)); |