Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fb68ffa authored by sail's avatar sail Committed by android-build-merger
Browse files

Merge "Fixed Dial fab changed to add to contact when multiwindow mode" 

am: d1be0b93

Change-Id: I758fb90c7dac1ae50abfe29578b818279687772a
parents 40cd14f3 d1be0b93

src/com/android/dialer/DialtactsActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -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));