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

Commit 5d612da2 authored by Tingting Wang's avatar Tingting Wang
Browse files

resolve merge conflicts of 1243cb4e to master 

Change-Id: Ib619fe1ac6e52203f47a88345c6060f11e490815
parents 8268de5d 1243cb4e

src/com/android/contacts/activities/PeopleActivity.java

+15 −2
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ import com.android.contacts.list.ContactsIntentResolver; 
import com.android.contacts.list.ContactsRequest;

import com.android.contacts.list.ContactsUnavailableFragment;

import com.android.contacts.list.DefaultContactBrowseListFragment;

import com.android.contacts.list.DefaultContactBrowseListFragment.FeatureHighlightCallback;

import com.android.contacts.list.MultiSelectContactsListFragment.OnCheckBoxListActionListener;

import com.android.contacts.list.OnContactBrowserActionListener;

import com.android.contacts.list.OnContactsUnavailableActionListener;
@@ -111,7 +112,8 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
        DialogManager.DialogShowingViewActivity,

        ContactListFilterController.ContactListFilterListener,

        ProviderStatusListener,

        MultiContactDeleteListener {

        MultiContactDeleteListener,

        DefaultContactBrowseListFragment.FeatureHighlightCallback {



    private static final String TAG = "PeopleActivity";
@@ -411,6 +413,7 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
            transaction.add(R.id.tab_pager, mAllFragment, ALL_TAG);

        }



        mAllFragment.setFeatureHighlightCallback(this);

        mAllFragment.setOnContactListActionListener(new ContactBrowserActionListener());

        mAllFragment.setCheckBoxListListener(new CheckBoxListListener());

        mAllFragment.setListType(mContactListFilterController.getFilterListType());
@@ -647,9 +650,14 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
                showFabWithAnimation(shouldShowFabForAccount());

                break;

            case ActionBarAdapter.Listener.Action.STOP_SEARCH_AND_SELECTION_MODE:

                // If queryString is empty, fragment data will not be reloaded,

                // so hamburger promo should be checked now.

                // If not empty, promo should be checked and displayed after reloading. (b/30706521)

                if (TextUtils.isEmpty(mAllFragment.getQueryString())) {

                    maybeShowHamburgerFeatureHighlight();

                }

                setQueryTextToFragment("");

                updateFragmentsVisibility();

                maybeShowHamburgerFeatureHighlight();

                invalidateOptionsMenu();

                showFabWithAnimation(shouldShowFabForAccount());

                // Determine whether the account has pullToRefresh feature
@@ -1593,4 +1601,9 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
    protected ContactListFilter getContactListFilter() {

        return mContactListFilterController.getFilter();

    }



    @Override

    public void onLoadFinishedCallback() {

        maybeShowHamburgerFeatureHighlight();

    }

}

src/com/android/contacts/list/DefaultContactBrowseListFragment.java

+13 −1
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment 
    private View mAccountFilterContainer;

    private TextView mSearchProgressText;

    private SwipeRefreshLayout mSwipeRefreshLayout;

    private FeatureHighlightCallback mCallback;



    public interface FeatureHighlightCallback {

        void onLoadFinishedCallback();

    }



    public DefaultContactBrowseListFragment() {

        setPhotoLoaderEnabled(true);
@@ -75,6 +80,10 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment 
        setDisplayDirectoryHeader(false);

    }



    public void setFeatureHighlightCallback(FeatureHighlightCallback callback) {

        mCallback = callback;

    }



    @Override

    public CursorLoader createCursorLoader(Context context) {

        return new FavoritesAndContactsLoader(context);
@@ -84,6 +93,9 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment 
    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {

        bindListHeader(data.getCount());

        super.onLoadFinished(loader, data);

        if (!isSearchMode() && mCallback != null) {

            mCallback.onLoadFinishedCallback();

        }

    }



    private void bindListHeader(int numberOfContacts) {