Introduce AppCompatActivity and modify account filter activities
- added PeopleThemeAppCompat for AppCompatActivity, and it will replace
PeopleTheme eventually (same for ContactsActionBarStyleAppCompat).
- removed "icon" from styleable Mapping since there would be conflict
when including appcompat in Android.mk.
- will clean up styles.xml after finalize all the changes.
Bug: 25629359
Change-Id: I988cee41a75800a63375e95242042ba0d0380300
diff --git a/Android.mk b/Android.mk
index 0679ac1..b0fa901 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
+ $(support_library_root_dir)/v7/appcompat/res \
$(support_library_root_dir)/v7/cardview/res
LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
@@ -25,6 +26,7 @@
--auto-add-overlay \
--extra-packages com.android.contacts.common \
--extra-packages com.android.phone.common \
+ --extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.cardview
LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -32,6 +34,7 @@
android-common \
guava \
android-support-v13 \
+ android-support-v7-appcompat \
android-support-v7-cardview \
android-support-v7-palette \
android-support-v4 \