Merge "Update to match fragment APIs."
Refactoring contact list mode resolution.

Also, removing tons of obsolete code.

Change-Id: Ib661fae4f7568e18bb98d5f5e85d1ba75dc32cdb
Cleaning up the implementation of Intents.SEARCH_SUGGESTION_CLICKED

Change-Id: Ib29aec1eb31bee61c594e3fd9d745ff073358bd7
Breaking search UI out of the contact list fragment

Change-Id: I6d0dbdccaf6a55b380984710989fe8a1f674d3fd
Merge commit '1ce1e7cf261994e46e6fe85ed4d445241ad55f16' into HEAD

* commit '1ce1e7cf261994e46e6fe85ed4d445241ad55f16':
  Refactoring contact list mode resolution.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Merge commit '884e393af339ba1357dd1aea4c8e821396c214b9' into HEAD

* commit '884e393af339ba1357dd1aea4c8e821396c214b9':
  Cleaning up the implementation of Intents.SEARCH_SUGGESTION_CLICKED
Merge commit 'fe42e55dfc483b69c8a7831c16fbdbc5ab19929e' into HEAD

* commit 'fe42e55dfc483b69c8a7831c16fbdbc5ab19929e':
  Breaking search UI out of the contact list fragment
Revert "DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer"

This reverts commit c7f25410daccf9e14c1726fd3e778910d894f243.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Revert "DO NOT MERGE Sticky tab rule: Remember the last tab that was used to call"

This reverts commit 00ea05799040a55f85cc449fede956983003af97.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
	src/com/android/contacts/DialtactsActivity.java
	src/com/android/contacts/PhoneDisambigDialog.java
	src/com/android/contacts/ViewContactActivity.java
Revert "Implement granting of URI permissions from picker.  DO NOT MERGE."

This reverts commit 958aca24fb348cd8795a952df7de299f09e66d2d.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java