diff options
| author | sail <sail@google.com> | 2016-10-17 20:19:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-17 20:19:38 +0000 |
| commit | bbcefc57efa43831bdd0b6b4fcef611f6f97263c (patch) | |
| tree | f3ceb5925824d4f918b5254f3ae4bbc97d04a988 | |
| parent | 7b318c920c9ec83a32d8be2629b2aa029e23ca85 (diff) | |
| parent | cbe0b39ab3060e8d5006998542d97053bbce58f4 (diff) | |
Merge "Fixed Dial fab changed to add to contact when multiwindow mode" am: d1be0b9328 am: 4fb68ffaa1
am: cbe0b39ab3
Change-Id: I911ba292fd8bd9347dfe47b2681f91f0703d1252
| -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)); |