diff options
| author | sail <sail@google.com> | 2016-10-17 20:00:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-17 20:00:26 +0000 |
| commit | d1be0b9328f56d98e3d623d38d0c279a290a1ee0 (patch) | |
| tree | f522fdb23e05a3ea745001d6c684bdec0d243451 /src/com | |
| parent | 5db64dc0eaf9edaf09c43be4a304c0d1c34a7fa2 (diff) | |
| parent | 10c93827c3603e51a1e9373a7fb55b37f4e60487 (diff) | |
Merge "Fixed Dial fab changed to add to contact when multiwindow mode"
Diffstat (limited to 'src/com')
| -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)); |