Merge "Change g+ icon with latest version in QuickContact UI." into ub-contactsdialer-f-dev
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index dae57fc..d1f05f6 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -41,6 +41,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
UiIntentActions.GROUP_CONTACT_IDS);
mListFragment = GroupMemberPickerFragment.newInstance(
accountName, accountType, accountDataSet, contactIds);
+ mListFragment.setListType(ListEvent.ListType.PICK_GROUP_MEMBERS);
break;
}
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 6c2656d..092c6ab 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -335,7 +335,7 @@
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.
@@ -1391,9 +1391,8 @@
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);
diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index 89b02da..d961f34 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -34,6 +34,7 @@
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 @@
final Cursor suggestionsCursor =
((JoinContactLoaderResult) data).suggestionCursor;
onContactListLoaded(suggestionsCursor, data);
+ maybeLogListEvent();
}
break;
}
@@ -101,6 +103,8 @@
setSectionHeaderDisplayEnabled(true);
setVisibleScrollbarEnabled(false);
setQuickContactEnabled(false);
+ setListType(ListEvent.ListType.PICK_JOIN);
+ setLogListEvents(true);
}
public void setOnContactPickerActionListener(OnContactPickerActionListener listener) {
diff --git a/src/com/android/contacts/list/MultiSelectContactsListFragment.java b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
index 6fd15e9..2612cf2 100644
--- a/src/com/android/contacts/list/MultiSelectContactsListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
@@ -309,7 +309,7 @@
final ImageView accountFilterHeaderIcon = (ImageView) accountFilterContainer
.findViewById(R.id.account_filter_icon);
- accountFilterHeaderIcon.setVisibility(View.INVISIBLE);
+ accountFilterHeaderIcon.setVisibility(View.GONE);
}
/**