From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 9 Jun 2017 14:16:05 +0000 Subject: Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47" This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44. Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master. Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b --- .../dialer/contactsfragment/ContactsFragment.java | 138 ++++----------------- 1 file changed, 21 insertions(+), 117 deletions(-) (limited to 'java/com/android/dialer/contactsfragment/ContactsFragment.java') diff --git a/java/com/android/dialer/contactsfragment/ContactsFragment.java b/java/com/android/dialer/contactsfragment/ContactsFragment.java index a996a4fad..ea662fc89 100644 --- a/java/com/android/dialer/contactsfragment/ContactsFragment.java +++ b/java/com/android/dialer/contactsfragment/ContactsFragment.java @@ -16,125 +16,63 @@ package com.android.dialer.contactsfragment; -import android.Manifest.permission; import android.app.Fragment; import android.app.LoaderManager.LoaderCallbacks; import android.content.Loader; -import android.content.pm.PackageManager; import android.database.Cursor; import android.os.Bundle; -import android.provider.ContactsContract.Contacts; import android.support.annotation.Nullable; -import android.support.v13.app.FragmentCompat; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.Recycler; -import android.support.v7.widget.RecyclerView.State; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnScrollChangeListener; import android.view.ViewGroup; import android.widget.TextView; -import com.android.contacts.common.preference.ContactsPreferences; -import com.android.dialer.common.Assert; -import com.android.dialer.util.DialerUtils; -import com.android.dialer.util.IntentUtil; import com.android.dialer.util.PermissionsUtil; -import com.android.dialer.widget.EmptyContentView; -import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener; /** Fragment containing a list of all contacts. */ public class ContactsFragment extends Fragment - implements LoaderCallbacks, - OnScrollChangeListener, - OnEmptyViewActionButtonClickedListener { + implements LoaderCallbacks, OnScrollChangeListener { - public static final int READ_CONTACTS_PERMISSION_REQUEST_CODE = 1; - - private FastScroller fastScroller; private TextView anchoredHeader; private RecyclerView recyclerView; private LinearLayoutManager manager; private ContactsAdapter adapter; - private EmptyContentView emptyContentView; - - private ContactsPreferences contactsPrefs; - - private final ContactsPreferences.ChangeListener preferencesChangeListener = - () -> getLoaderManager().restartLoader(0, null, this); - - @Override - public void onCreate(Bundle savedState) { - super.onCreate(savedState); - contactsPrefs = new ContactsPreferences(getContext()); - contactsPrefs.registerChangeListener(preferencesChangeListener); - } @Nullable @Override public View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_contacts, container, false); - fastScroller = (FastScroller) view.findViewById(R.id.fast_scroller); anchoredHeader = (TextView) view.findViewById(R.id.header); - recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view); + manager = new LinearLayoutManager(getContext()); - emptyContentView = (EmptyContentView) view.findViewById(R.id.empty_list_view); - emptyContentView.setImage(R.drawable.empty_contacts); - emptyContentView.setActionClickedListener(this); + // TODO: Handle contacts permission denied view + // TODO: Handle 0 contacts layout + recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view); + recyclerView.setLayoutManager(manager); + getLoaderManager().initLoader(0, null, this); if (PermissionsUtil.hasContactsReadPermissions(getContext())) { getLoaderManager().initLoader(0, null, this); - } else { - emptyContentView.setDescription(R.string.permission_no_contacts); - emptyContentView.setActionLabel(R.string.permission_single_turn_on); - emptyContentView.setVisibility(View.VISIBLE); } return view; } - /** @return a loader according to sort order and display order. */ @Override public Loader onCreateLoader(int id, Bundle args) { - boolean sortOrderPrimary = - (contactsPrefs.getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY); - boolean displayOrderPrimary = - (contactsPrefs.getDisplayOrder() == ContactsPreferences.DISPLAY_ORDER_PRIMARY); - - String sortKey = sortOrderPrimary ? Contacts.SORT_KEY_PRIMARY : Contacts.SORT_KEY_ALTERNATIVE; - return displayOrderPrimary - ? ContactsCursorLoader.createInstanceDisplayNamePrimary(getContext(), sortKey) - : ContactsCursorLoader.createInstanceDisplayNameAlternative(getContext(), sortKey); + return new ContactsCursorLoader(getContext()); } @Override public void onLoadFinished(Loader loader, Cursor cursor) { - if (cursor.getCount() == 0) { - emptyContentView.setDescription(R.string.all_contacts_empty); - emptyContentView.setActionLabel(R.string.all_contacts_empty_add_contact_action); - emptyContentView.setVisibility(View.VISIBLE); - } else { - emptyContentView.setVisibility(View.GONE); - adapter = new ContactsAdapter(getContext(), cursor); - manager = - new LinearLayoutManager(getContext()) { - @Override - public void onLayoutChildren(Recycler recycler, State state) { - super.onLayoutChildren(recycler, state); - int itemsShown = findLastVisibleItemPosition() - findFirstVisibleItemPosition() + 1; - if (adapter.getItemCount() > itemsShown) { - fastScroller.setVisibility(View.VISIBLE); - recyclerView.setOnScrollChangeListener(ContactsFragment.this); - } else { - fastScroller.setVisibility(View.GONE); - } - } - }; - - recyclerView.setLayoutManager(manager); - recyclerView.setAdapter(adapter); - fastScroller.setup(adapter, manager); + // TODO setup fast scroller. + adapter = new ContactsAdapter(getContext(), cursor); + recyclerView.setAdapter(adapter); + if (adapter.getItemCount() > 1) { + recyclerView.setOnScrollChangeListener(this); } } @@ -143,7 +81,6 @@ public class ContactsFragment extends Fragment recyclerView.setAdapter(null); recyclerView.setOnScrollChangeListener(null); adapter = null; - contactsPrefs.unregisterChangeListener(); } /* @@ -158,10 +95,8 @@ public class ContactsFragment extends Fragment */ @Override public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) { - fastScroller.updateContainerAndScrollBarPosition(recyclerView); int firstVisibleItem = manager.findFirstVisibleItemPosition(); int firstCompletelyVisible = manager.findFirstCompletelyVisibleItemPosition(); - String anchoredHeaderString = adapter.getHeaderString(firstCompletelyVisible); // If the user swipes to the top of the list very quickly, there is some strange behavior // between this method updating headers and adapter#onBindViewHolder updating headers. @@ -169,46 +104,15 @@ public class ContactsFragment extends Fragment if (firstVisibleItem == firstCompletelyVisible && firstVisibleItem == 0) { adapter.refreshHeaders(); anchoredHeader.setVisibility(View.INVISIBLE); - } else if (adapter.getHeaderString(firstVisibleItem).equals(anchoredHeaderString)) { - anchoredHeader.setText(anchoredHeaderString); - anchoredHeader.setVisibility(View.VISIBLE); - getContactHolder(firstVisibleItem).getHeaderView().setVisibility(View.INVISIBLE); - getContactHolder(firstCompletelyVisible).getHeaderView().setVisibility(View.INVISIBLE); } else { - anchoredHeader.setVisibility(View.INVISIBLE); - getContactHolder(firstVisibleItem).getHeaderView().setVisibility(View.VISIBLE); - getContactHolder(firstCompletelyVisible).getHeaderView().setVisibility(View.VISIBLE); - } - } - - private ContactViewHolder getContactHolder(int position) { - return ((ContactViewHolder) recyclerView.findViewHolderForAdapterPosition(position)); - } - - @Override - public void onEmptyViewActionButtonClicked() { - if (emptyContentView.getActionLabel() == R.string.permission_single_turn_on) { - FragmentCompat.requestPermissions( - this, new String[] {permission.READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE); - } else if (emptyContentView.getActionLabel() - == R.string.all_contacts_empty_add_contact_action) { - // Add new contact - DialerUtils.startActivityWithErrorToast( - getContext(), IntentUtil.getNewContactIntent(), R.string.add_contact_not_available); - } else { - throw Assert.createIllegalStateFailException("Invalid empty content view action label."); - } - } - - @Override - public void onRequestPermissionsResult( - int requestCode, String[] permissions, int[] grantResults) { - if (requestCode == READ_CONTACTS_PERMISSION_REQUEST_CODE) { - if (grantResults.length >= 1 && PackageManager.PERMISSION_GRANTED == grantResults[0]) { - // Force a refresh of the data since we were missing the permission before this. - emptyContentView.setVisibility(View.GONE); - getLoaderManager().initLoader(0, null, this); - } + boolean showAnchor = + adapter.getHeader(firstVisibleItem).equals(adapter.getHeader(firstCompletelyVisible)); + anchoredHeader.setText(adapter.getHeader(firstCompletelyVisible)); + anchoredHeader.setVisibility(showAnchor ? View.VISIBLE : View.INVISIBLE); + + int rowHeaderVisibility = showAnchor ? View.INVISIBLE : View.VISIBLE; + adapter.setHeaderVisibility(firstVisibleItem, rowHeaderVisibility); + adapter.setHeaderVisibility(firstCompletelyVisible, rowHeaderVisibility); } } } -- cgit v1.2.3