diff options
author | Nancy Chen <nancychen@google.com> | 2015-08-13 12:03:47 -0700 |
---|---|---|
committer | Nancy Chen <nancychen@google.com> | 2015-08-13 14:30:01 -0700 |
commit | 44898ad0aa2a12788fc9cfc6b78fa7adc9d90f23 (patch) | |
tree | b484d58e0009d6336c83c463440d3ecf95ce5d8f /Android.mk | |
parent | f5250369eb99d5f2b435be845b5bb19a531538bb (diff) |
Convert Dialer activities to AppCompat to support Snackbar.
In order to add an "Undo" snackbar for voicemail, dialer activities need
to inherit from the AppCompat library. Add the relevant libraries to the
make files and change the styles to be compatible.
Bug: 22460745
Change-Id: Ia3cc4002cbd943da818fec67f888d085d53a3b25
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 1440fcc3f..ba346d252 100644 --- a/Android.mk +++ b/Android.mk @@ -19,12 +19,17 @@ res_dirs := res \ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \ - frameworks/support/v7/cardview/res frameworks/support/v7/recyclerview/res + frameworks/support/v7/appcompat/res \ + frameworks/support/v7/cardview/res \ + frameworks/support/v7/recyclerview/res \ + frameworks/support/design/res LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ + --extra-packages android.support.v7.appcompat \ --extra-packages android.support.v7.cardview \ --extra-packages android.support.v7.recyclerview \ + --extra-packages android.support.design \ --extra-packages com.android.incallui \ --extra-packages com.android.contacts.common \ --extra-packages com.android.phone.common @@ -34,8 +39,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-common \ android-support-v13 \ android-support-v4 \ + android-support-v7-appcompat \ android-support-v7-cardview \ android-support-v7-recyclerview \ + android-support-design \ com.android.services.telephony.common \ com.android.vcard \ guava \ |