summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYvonne Wong <ywong@cyngn.com>2016-05-11 14:02:12 -0700
committerStephen Bird <sbird@cyngn.com>2016-09-13 15:07:21 -0700
commit1a3b89e56b63270c0394f5b50cd4ce3081c1f7ee (patch)
tree381c5a92a0f438e1ec69ab5726cd7cd1bebb5bdb /Android.mk
parent2bb428b3a4319a20a52c9c6fa27308501858d3f0 (diff)
downloadpackages_apps_Messaging-1a3b89e56b63270c0394f5b50cd4ce3081c1f7ee.tar.gz
packages_apps_Messaging-1a3b89e56b63270c0394f5b50cd4ce3081c1f7ee.tar.bz2
packages_apps_Messaging-1a3b89e56b63270c0394f5b50cd4ce3081c1f7ee.zip
Add maps preview for addresses and integrate ridesharing request into Messaging
- Uses the first map link found in a message to get a static map view - The static map view is shown as a preview and can be clicked to go into the default maps app - Clicking on request ride will lead the user to RideCoreUI with pickup location prefilled based on the address in the map link - Clicking on the directions button will lead the user to google maps's navigation - Display placeholder background when map is loading or offline with no cached image - Use RoundedCornerTransformation to transform the map into a bitmap with rounded corners - Show brand bitmap from ridesharing services if an active provider is chosen, otherwise display the generic ridesharing icon Change-Id: I8e74c6d9beeaa58f01f0a51e5a831c6697c890ea Issue-Id: RIDE-75, RIDE-76, RIDE-77
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 532752e..88b3239 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,6 +51,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += guava
LOCAL_STATIC_JAVA_LIBRARIES += libchips
LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer
LOCAL_STATIC_JAVA_LIBRARIES += libphonenumber
+LOCAL_STATIC_JAVA_LIBRARIES += play
LOCAL_STATIC_JAVA_LIBRARIES += colorpicker
LOCAL_STATIC_JAVA_LIBRARIES += contacts-picaso
@@ -67,6 +68,7 @@ LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.photo
LOCAL_AAPT_FLAGS += --extra-packages com.android.colorpicker
LOCAL_AAPT_FLAGS += --extra-packages com.android.contacts.common
LOCAL_AAPT_FLAGS += --extra-packages com.android.phone.common
+LOCAT_AAPT_FLAGS += --extra-packages com.google.android.gms
ifdef TARGET_BUILD_APPS
LOCAL_JNI_SHARED_LIBRARIES := libframesequence libgiftranscode
@@ -75,11 +77,7 @@ else
endif
# utilize ContactsCommon's phone-number-based contact-info lookup
-ifeq ($(contacts_common_dir),)
- contacts_common_dir := ../ContactsCommon
-endif
-CONTACTS_COMMON_LOOKUP_PROVIDER ?= $(LOCAL_PATH)/$(contacts_common_dir)/info_lookup
-include $(CONTACTS_COMMON_LOOKUP_PROVIDER)/phonenumber_lookup_provider.mk
+include $(LOCAL_PATH)/../ContactsCommon/info_lookup/phonenumber_lookup_provider.mk
LOCAL_PROGUARD_FLAGS := -ignorewarnings -include build/core/proguard_basic_keeps.flags