diff options
| author | Erica Chang <echang@cyngn.com> | 2016-01-21 19:02:40 -0800 |
|---|---|---|
| committer | Erica Chang <echang@cyngn.com> | 2016-04-07 12:05:10 -0700 |
| commit | a7f0f11091c69868142597f972cc22cd95e27a76 (patch) | |
| tree | 5cfd4766564a5b630453fd4ba46bea3371cc8aac /Android.mk | |
| parent | 1e2ad0157e708d06728ef575aa556c1e0455d278 (diff) | |
| download | packages_apps_Contacts-a7f0f11091c69868142597f972cc22cd95e27a76.tar.gz packages_apps_Contacts-a7f0f11091c69868142597f972cc22cd95e27a76.tar.bz2 packages_apps_Contacts-a7f0f11091c69868142597f972cc22cd95e27a76.zip | |
Contacts: incall plugin implementation
Contacts Card: fixed encoded contact Uri invite intent
-When a contacts card is launched from a dialed phone number history, the
particular contact does not exist in contacts so the uri is encoded. In
this case we'll provide either the display name or phone number as the Uri
argument for getInvitePendingIntent.
CD-346
Contacts Card: fix callog
-added in cm-12.1 calllog related changes that accidentally didn't get
merged in
CD-354
Contacts Card: removed redundant code from cm-13.0 creation
-in Quick contact card onclick handler there's redundant code since cm-13.0
was created
Contacts Card: fix multiple ContacLoader calls issue
-consodliate one AsynTask to load contact data
-added a synchronized method checkAndBindContactData to fix contact card
update condition
Note. The internal implementation of AsyncTask.doInBackground is done on
FutureTask; onPostExecute run on a main loop via Message. If the
onPostExecute is already placed on the main loop, it can no longer
be cancelled. cancel() is the most effective while an AsyncTask
is still running doInBackground, upon completion, it'd either
execute onCancelled() or onPostExecute()
CD-324
Contacts: lookup plugin account handles as a backup
-Need to rely on AccountManager to lookup logged in plugin account
handles just in case the plugin fails to return a valid one
CD-422
(2/2) Contacts: refactor
-makes use of PhoneCommon/CallMethodInfo.java, CallMethodHelper
-new InCallPluginHelper extends CallMethodHelper
-InCallPluginUtils uses CallMethodHelper singleton and
StartInCallCallReceiver
CD-301,CD-374,CD-423
Change-Id: Iaa6f3f4539969a8cdad7c719f71ffaad8dd8cc39
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index b9bcf90c3..3d19b64c1 100644 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,10 @@ LOCAL_MODULE_TAGS := optional contacts_common_dir := ../ContactsCommon phone_common_dir := ../PhoneCommon -src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src +src_dirs := src $(contacts_common_dir)/src \ + $(phone_common_dir)/src \ + $(phone_common_dir)/src-ambient + res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) @@ -17,7 +20,8 @@ LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --extra-packages com.android.contacts.common \ --extra-packages com.android.phone.common \ - --extra-packages android.support.v7.cardview + --extra-packages android.support.v7.cardview \ + --extra-packages com.cyanogen.ambient LOCAL_JAVA_LIBRARIES := telephony-common voip-common LOCAL_STATIC_JAVA_LIBRARIES := \ |