Log device, custom, and picker list types (1/3) (2632bb94) · Commits · e / os / android_packages_apps_Contacts

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

+12 −3

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.contacts.common.list.ContactEntryListFragment;
		import com.android.contacts.common.list.DirectoryListLoader;
		import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
		import com.android.contacts.common.list.PhoneNumberPickerFragment;
		import com.android.contacts.common.logging.ListEvent;
		import com.android.contacts.common.util.ViewUtil;
		import com.android.contacts.editor.EditorIntents;
		import com.android.contacts.list.ContactPickerFragment;
		@@ -261,6 +262,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
		fragment.setEditMode(true);
		fragment.setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_NONE);
		fragment.setCreateContactEnabled(!mRequest.isSearchMode());
		fragment.setListType(ListEvent.ListType.PICK_CONTACT);
		mListFragment = fragment;
		break;
		}
		@@ -269,6 +271,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
		case ContactsRequest.ACTION_PICK_CONTACT: {
		ContactPickerFragment fragment = new ContactPickerFragment();
		fragment.setIncludeFavorites(mRequest.shouldIncludeFavorites());
		fragment.setListType(ListEvent.ListType.PICK_CONTACT);
		mListFragment = fragment;
		break;
		}
		@@ -276,6 +279,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
		case ContactsRequest.ACTION_PICK_OR_CREATE_CONTACT: {
		ContactPickerFragment fragment = new ContactPickerFragment();
		fragment.setCreateContactEnabled(!mRequest.isSearchMode());
		fragment.setListType(ListEvent.ListType.PICK_CONTACT);
		mListFragment = fragment;
		break;
		}
		@@ -283,25 +287,28 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
		case ContactsRequest.ACTION_CREATE_SHORTCUT_CONTACT: {
		ContactPickerFragment fragment = new ContactPickerFragment();
		fragment.setShortcutRequested(true);
		fragment.setListType(ListEvent.ListType.PICK_CONTACT_FOR_SHORTCUT);
		mListFragment = fragment;
		break;
		}

		case ContactsRequest.ACTION_PICK_PHONE: {
		PhoneNumberPickerFragment fragment = getPhoneNumberPickerFragment(mRequest);
		fragment.setListType(ListEvent.ListType.PICK_PHONE);
		mListFragment = fragment;
		break;
		}

		case ContactsRequest.ACTION_PICK_EMAIL: {
		mListFragment = new EmailAddressPickerFragment();
		mListFragment.setListType(ListEvent.ListType.PICK_EMAIL);
		break;
		}

		case ContactsRequest.ACTION_CREATE_SHORTCUT_CALL: {
		PhoneNumberPickerFragment fragment = getPhoneNumberPickerFragment(mRequest);
		fragment.setShortcutAction(Intent.ACTION_CALL);

		fragment.setListType(ListEvent.ListType.PICK_CONTACT_FOR_SHORTCUT);
		mListFragment = fragment;
		break;
		}
		@@ -309,14 +316,14 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
		case ContactsRequest.ACTION_CREATE_SHORTCUT_SMS: {
		PhoneNumberPickerFragment fragment = getPhoneNumberPickerFragment(mRequest);
		fragment.setShortcutAction(Intent.ACTION_SENDTO);

		fragment.setListType(ListEvent.ListType.PICK_CONTACT_FOR_SHORTCUT);
		mListFragment = fragment;
		break;
		}

		case ContactsRequest.ACTION_PICK_POSTAL: {
		PostalAddressPickerFragment fragment = new PostalAddressPickerFragment();

		fragment.setListType(ListEvent.ListType.PICK_POSTAL);
		mListFragment = fragment;
		break;
		}
		@@ -324,6 +331,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
		case ContactsRequest.ACTION_PICK_JOIN: {
		JoinContactListFragment joinFragment = new JoinContactListFragment();
		joinFragment.setTargetContactId(getTargetContactId());
		joinFragment.setListType(ListEvent.ListType.PICK_JOIN);
		mListFragment = joinFragment;
		break;
		}
		@@ -339,6 +347,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
		UiIntentActions.GROUP_CONTACT_IDS);
		mListFragment = GroupMemberPickerFragment.newInstance(
		accountName, accountType, accountDataSet, contactIds);
		mListFragment.setListType(ListEvent.ListType.PICK_GROUP_MEMBERS);
		break;
		}

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ public class PeopleActivity extends ContactsDrawerActivity implements

		mAllFragment.setOnContactListActionListener(new ContactBrowserActionListener());
		mAllFragment.setCheckBoxListListener(new CheckBoxListListener());
		mAllFragment.setListType(ListEvent.ListType.ALL_CONTACTS);
		mAllFragment.setListType(mContactListFilterController.getFilterListType());

		// Hide all fragments for now. We adjust visibility when we get onSelectedTabChanged()
		// from ActionBarAdapter.
		@@ -1394,9 +1394,8 @@ public class PeopleActivity extends ContactsDrawerActivity implements

		private void setFilterAndUpdateTitle(ContactListFilter filter, boolean restoreSelectedUri) {
		mAllFragment.setFilter(filter, restoreSelectedUri);
		final int listType = isAllContactsFilter(filter)
		? ListEvent.ListType.ALL_CONTACTS : ListEvent.ListType.ACCOUNT;
		mAllFragment.setListType(listType);

		mAllFragment.setListType(mContactListFilterController.getFilterListType());

		updateFilterMenu(filter);

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.widget.TextView;
		import com.android.contacts.R;
		import com.android.contacts.common.list.ContactEntryListFragment;
		import com.android.contacts.common.list.ContactListItemView;
		import com.android.contacts.common.logging.ListEvent;
		import com.android.contacts.list.JoinContactLoader.JoinContactLoaderResult;

		/**
		@@ -85,6 +86,7 @@ public class JoinContactListFragment extends ContactEntryListFragment<JoinContac
		final Cursor suggestionsCursor =
		((JoinContactLoaderResult) data).suggestionCursor;
		onContactListLoaded(suggestionsCursor, data);
		maybeLogListEvent();
		}
		break;
		}
		@@ -101,6 +103,8 @@ public class JoinContactListFragment extends ContactEntryListFragment<JoinContac
		setSectionHeaderDisplayEnabled(true);
		setVisibleScrollbarEnabled(false);
		setQuickContactEnabled(false);
		setListType(ListEvent.ListType.PICK_JOIN);
		setLogListEvents(true);
		}

		public void setOnContactPickerActionListener(OnContactPickerActionListener listener) {