Merge "Generic test code for getting synchronous loader results."
Moving phonetic name into a separate line

Change-Id: If5c28df5ac865322d736342f3bb45e7c9ca6cc7f
Merge "Moving phonetic name into a separate line"
Restoring some of the phone number picker with Loaders and Fragments

Also, adding support for pictures and section headers in
the phone picker.

Change-Id: Icc86442c6b45a942998204f2d6e8e3a5aff70de0
Making contact shortcuts work again (except new contact).

Also turning shortcut creation into a background task.

Change-Id: I9f36bb9c824bce519a4852b728f480a036c42bb0
Making call/sms shortcuts work with Loaders and Fragments.

Change-Id: Ie88fb17e0e533e8868c68f8e74d609df17310e35
Postal address picker now works with Loaders and Fragments.

(except search)

Change-Id: Ib7f20270a71a5234d505696e76e1f97f659eef22
Configuring empty list text for Loader/Fragment solution

Change-Id: I157a296e5fefeb6bdf5ffab9ebdc3883665c367a
Transferred handling of provider status from activity to fragment.

Not very happy with the design. It would probably be a good
idea to separate provider status handling into a class of
its own.

Change-Id: I18a6ec89620cf2561b3d8549d8bd328cb8cdb0bf
Fixing save state management for the contact list.

Interestingly enough, onRestoreSavedInstance is NOT called
during the onRestart() sequence!

Change-Id: I1b58f369c4ed03d3d778137d2e02162c047fc1e4
Bringing back contacts display preferences.

Cleaning up some life-cycle management issues.

Change-Id: Ifd29b898e46eb5bb713d65327d80cbf7aa562933
Clean-up. Removing some code that is no longer needed.

As the Loader/Fragment solution is now mostly working,
we can remove temporary dependencies on the activity
that we have been maintaining during the refactoring.

Change-Id: I092d99cb174e3bb5c27fd78af2d4a4356e05de68
Now supporting legacy contact picker in the Loader/Fragment solution.

(Except search)

Change-Id: Ia36f286dc3009f0a388be2802d97ee296d74d1e8
Now supporting legacy phone number picker in the Loader/Fragment solution.

Change-Id: Id4e46eb8a4b2b5b2f722a98375d49acbf6cc69da
Now supporting legacy postal address picker in the Loader/Fragment solution.

Change-Id: I7cbb9dc455966b0f5d5e3537596410f6216c9fe0
Fixing position adjustment for contextual menu

Change-Id: Ifecccc9451a210876fb67ab2cf7f708f13bad1e8
Merge commit 'd820cdbefa159bdf4c281ac8102805fe9a165379' into HEAD

* commit 'd820cdbefa159bdf4c281ac8102805fe9a165379':
  Postal address picker now works with Loaders and Fragments.
  Making call/sms shortcuts work with Loaders and Fragments.
  Making contact shortcuts work again (except new contact).
  Restoring some of the phone number picker with Loaders and Fragments
  Moving phonetic name into a separate line

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
	src/com/android/contacts/JoinContactActivity.java
Merge commit '8b15a725a3ff28354616f61791a12372cc513fe3' into HEAD

* commit '8b15a725a3ff28354616f61791a12372cc513fe3':
  Fixing position adjustment for contextual menu
  Now supporting legacy postal address picker in the Loader/Fragment solution.
  Now supporting legacy phone number picker in the Loader/Fragment solution.
  Now supporting legacy contact picker in the Loader/Fragment solution.
  Clean-up. Removing some code that is no longer needed.
  Bringing back contacts display preferences.
  Fixing save state management for the contact list.
  Transferred handling of provider status from activity to fragment.
  Configuring empty list text for Loader/Fragment solution

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Modify ImportVCardService so that it does not rely on a stale constructor.

We are not 100% sure whether this change is really correct though all tests are in green.

Related change: I16e487fa

Change-Id: I0a5aa1ea587c6b2d25ce90ba0a23bc14ea8a12f5
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