Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
ContactsCommon: Add optional text highlight color

Change-Id: Ia2b7786ea32fc9cda029d90df7ba3f3ac4782fe4
The FastScroller is not working properly.

If you have a large number of contacts in the last section of contacts list,
when you scroll the list, the fast scroll bar will work improperly, it will scroll back.

The reason is that when we scroll to the last section, the next position of the next section is -1 but not the count of the contacts.

Change-Id: I058b3e6c88e8aaeabbfed291296e02dfd775018e
contacts-common: Add support for import contacts to local phone storage

This change allow to select the local storage account to add/import contacts
when others cloud/corporate accounts exists. If one or more account exists just
ask the user to select the destination account

Depends on: http://review.cyanogenmod.org/#/c/59352/

JIRA: CYAN-391
Issue: https://jira.cyanogenmod.org/browse/CYAN-391
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	src/com/android/contacts/common/interactions/ImportExportDialogFragment.java

Change-Id: I0120861479a4dcced11a430803513fc21a2e130b
contacts: return the first sdcard entry found

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	src/com/android/contacts/common/MoreContactUtils.java

Change-Id: I513cfe6acb9a7ac85ddeba7f92b8efc5e19ed369
contacts: don't assume the device has an sdcard

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	src/com/android/contacts/common/MoreContactUtils.java
	src/com/android/contacts/common/vcard/ImportVCardActivity.java

Change-Id: I5c8abfd53527f4ea83e6202c953affd589810774
Import feature - auto prompt for importing SIM contacts

Change-Id: I1c24094c3d588edf2d1182d8369882523e6f6512
Add a checkable QuickContactBadge.

To be used from multi picker UI.
FlipDrawable and CheckableFlipDrawable were kanged from UnifiedEmail.

Change-Id: Ic910071da9314526c3d75ab354b62645399824ce
Fix checkmarks being displayed stretched for contact pictures.

Taking the intrinsic size of the contact picture for the whole drawable
has the unwanted side effect of the picture size being applied to the
checkmark drawable as well. Fix it by not applying an intrinsic size to
the flip drawable and doing the scaling formerly done by ImageView by
ourselves.
Also take some cleanup potential.

Change-Id: I0fb07d0631781a345e6a0602ac181a6d76cdf476
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_packages_apps_ContactsCommon into lollipop