diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-05 23:20:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-05 23:20:34 +0000 |
commit | 24084af3b3b6906872c843b706e93e7c48d5345e (patch) | |
tree | fc5c0d6de51fb3a765f7c700d21f0b5679ff4aa1 /src | |
parent | 82974b2a33a26eb41d137f0b29484961fd71293a (diff) | |
parent | 0284f76fe813c4ebdf1d0d3472060719757fe394 (diff) |
Merge changes Id1c7d48f,Ib903d19c into mnc-dev
* changes:
Show empty view after load returns empty.
Change text to "add to a contact".
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/list/AllContactsFragment.java | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/com/android/dialer/list/AllContactsFragment.java b/src/com/android/dialer/list/AllContactsFragment.java index eaa5cc808..20e88e22b 100644 --- a/src/com/android/dialer/list/AllContactsFragment.java +++ b/src/com/android/dialer/list/AllContactsFragment.java @@ -16,6 +16,7 @@ package com.android.dialer.list; +import android.content.Loader; import android.database.Cursor; import android.net.Uri; import android.provider.ContactsContract.CommonDataKinds.Phone; @@ -39,6 +40,8 @@ import com.android.dialer.util.DialerUtils; */ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryListAdapter> { + private View mEmptyListView; + public AllContactsFragment() { setQuickContactEnabled(false); setAdjustSelectionBoundsEnabled(true); @@ -52,10 +55,11 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi public void onViewCreated(View view, android.os.Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - View emptyListView = view.findViewById(R.id.empty_list_view); - DialerUtils.configureEmptyListView(emptyListView, R.drawable.empty_contacts, + View mEmptyListView = view.findViewById(R.id.empty_list_view); + DialerUtils.configureEmptyListView(mEmptyListView, R.drawable.empty_contacts, R.string.all_contacts_empty, getResources()); - getListView().setEmptyView(emptyListView); + getListView().setEmptyView(mEmptyListView); + mEmptyListView.setVisibility(View.GONE); ViewUtil.addBottomPaddingToListViewForFab(getListView(), getResources()); } @@ -68,6 +72,15 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi } @Override + public void onLoadFinished(Loader<Cursor> loader, Cursor data) { + super.onLoadFinished(loader, data); + + if (data.getCount() == 0) { + mEmptyListView.setVisibility(View.VISIBLE); + } + } + + @Override protected ContactEntryListAdapter createListAdapter() { if (!PermissionsUtil.hasContactsPermissions(getActivity())) { return new EmptyContactsListAdapter(getActivity()); |