Merge "Make filter header clickable" (7a330308) · Commits · e / os / android_packages_apps_Contacts

res/layout/contacts_list_content.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@
		android:paddingTop="@dimen/contact_browser_list_top_margin"
		android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"
		android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"
		android:background="?android:attr/selectableItemBackground"
		android:visibility="gone">
		<TextView
		android:id="@+id/account_filter_header"

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -94,8 +94,6 @@ public class DialtactsActivity extends Activity {

		private static final int TAB_INDEX_COUNT = 3;

		private static final int SUBACTIVITY_ACCOUNT_FILTER = 0;

		/** Name of the dialtacts shared preferences */
		static final String PREFS_DIALTACTS = "dialtacts";
		static final boolean PREF_FAVORITES_AS_CONTACTS_DEFAULT = false;
		@@ -276,7 +274,7 @@ public class DialtactsActivity extends Activity {
		final Intent intent =
		new Intent(DialtactsActivity.this, AccountFilterActivity.class);
		ContactListFilter filter = mContactListFilterController.getFilter();
		startActivityForResult(intent, SUBACTIVITY_ACCOUNT_FILTER);
		startActivityForResult(intent, AccountFilterActivity.DEFAULT_REQUEST_CODE);
		return true;
		}
		};
		@@ -895,7 +893,7 @@ public class DialtactsActivity extends Activity {
		return;
		}
		switch (requestCode) {
		case SUBACTIVITY_ACCOUNT_FILTER: {
		case AccountFilterActivity.DEFAULT_REQUEST_CODE: {
		ContactListFilter filter = (ContactListFilter) data.getParcelableExtra(
		AccountFilterActivity.KEY_EXTRA_CONTACT_LIST_FILTER);
		if (filter == null) {

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -108,7 +108,6 @@ public class PeopleActivity extends ContactsActivity

		private static final int SUBACTIVITY_NEW_GROUP = 2;
		private static final int SUBACTIVITY_EDIT_GROUP = 3;
		private static final int SUBACTIVITY_ACCOUNT_FILTER = 4;

		private static final String KEY_SEARCH_MODE = "searchMode";

		@@ -1352,7 +1351,7 @@ public class PeopleActivity extends ContactsActivity
		}
		case R.id.menu_contacts_filter: {
		final Intent intent = new Intent(this, AccountFilterActivity.class);
		startActivityForResult(intent, SUBACTIVITY_ACCOUNT_FILTER);
		startActivityForResult(intent, AccountFilterActivity.DEFAULT_REQUEST_CODE);
		return true;
		}
		case R.id.menu_search: {
		@@ -1429,7 +1428,7 @@ public class PeopleActivity extends ContactsActivity
		@Override
		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
		switch (requestCode) {
		case SUBACTIVITY_ACCOUNT_FILTER: {
		case AccountFilterActivity.DEFAULT_REQUEST_CODE: {
		if (resultCode == Activity.RESULT_OK) {
		ContactListFilter filter = (ContactListFilter) data.getParcelableExtra(
		AccountFilterActivity.KEY_EXTRA_CONTACT_LIST_FILTER);

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,15 @@ public class AccountFilterActivity extends ContactsActivity

		private static final int SUBACTIVITY_CUSTOMIZE_FILTER = 0;

		/**
		* Request code for this Activity, which will be used with
		* {@link Activity#startActivityForResult(Intent, int)}.
		*
		* This is useful when we want to share one request code among multiple Activities and
		* Fragments.
		*/
		public static final int DEFAULT_REQUEST_CODE = 10001;

		public static final String KEY_EXTRA_CONTACT_LIST_FILTER = "contactListFilter";

		private static final int FILTER_LOADER_ID = 0;

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.contacts.list;
		import com.android.contacts.R;
		import com.android.contacts.editor.ContactEditorFragment;

		import android.app.Activity;
		import android.content.CursorLoader;
		import android.content.Intent;
		import android.database.Cursor;
		@@ -25,6 +26,7 @@ import android.provider.ContactsContract.Contacts;
		import android.text.TextUtils;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.View.OnClickListener;
		import android.view.ViewGroup;
		import android.view.accessibility.AccessibilityEvent;
		import android.widget.Button;
		@@ -51,6 +53,19 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment

		private View mPaddingView;

		private class FilterHeaderClickListener implements OnClickListener {
		@Override
		public void onClick(View view) {
		final Activity activity = getActivity();
		if (activity != null) {
		final Intent intent = new Intent(activity, AccountFilterActivity.class);
		activity.startActivityForResult(
		intent, AccountFilterActivity.DEFAULT_REQUEST_CODE);
		}
		}
		}
		private OnClickListener mFilterHeaderClickListener = new FilterHeaderClickListener();

		public DefaultContactBrowseListFragment() {
		setPhotoLoaderEnabled(true);
		setSectionHeaderDisplayEnabled(true);
		@@ -87,6 +102,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
		mAccountFilterHeaderView = (TextView) getView().findViewById(R.id.account_filter_header);
		mAccountFilterHeaderContainer =
		getView().findViewById(R.id.account_filter_header_container);
		mAccountFilterHeaderContainer.setOnClickListener(mFilterHeaderClickListener);
		mCounterHeaderView = (TextView) getView().findViewById(R.id.contacts_count);

		// Create an empty user profile header and hide it for now (it will be visible if the