diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-07-27 12:30:18 -0700 |
|---|---|---|
| committer | Andrew Sapperstein <asapperstein@google.com> | 2014-08-04 23:09:14 -0700 |
| commit | 52882ff08fe9420fe2dbb3f681545a330222e9c8 (patch) | |
| tree | a580699c2c23ef3e9cdbe00130535786997c66ff /Android.mk | |
| parent | 53de448d6c67e56df4e3bcefb3e2d84c810e2e89 (diff) | |
| download | android_packages_apps_UnifiedEmail-52882ff08fe9420fe2dbb3f681545a330222e9c8.tar.gz android_packages_apps_UnifiedEmail-52882ff08fe9420fe2dbb3f681545a330222e9c8.tar.bz2 android_packages_apps_UnifiedEmail-52882ff08fe9420fe2dbb3f681545a330222e9c8.zip | |
switch to appcompat. b/16664350
Currently only for MailActivity, ComposeActivity,
and FolderSelectionActivity.
Any activity that inherits from ActionBarActivity must
use an Appcompat-derived style. Three styles currently
exist: UnifiedEmail.Appcompat, UnifiedEmail.Appcompat.Toolbar,
and ShortcutWidgetTheme are all based on appcompat.
go/appcompat-material-doc contains the full migration guide.
The fast version is:
All MenuItem-related work that relates to actions must use
the MenuItemCompat-equivalent.
Any theming should use the appcompat versions which don't require
a namespace prefix. For instance, use actionBarStyle instead of
android:actionBarStyle.
There are a few missing styles on views that can't use appcompat versions.
Those still use style overrides for v21 changes. All others use appcompat versions.
A few methods on activity should now use the support equivalents:
getSupportActionBar()
supportInvalidateOptionsMenu()
startSupportActionMode()
Change-Id: Ic6f5964f4115ab4bde49c19df5fe49c9086df965
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 4775d688b..ef3693a5c 100644 --- a/Android.mk +++ b/Android.mk @@ -17,12 +17,13 @@ LOCAL_PATH:= $(call my-dir) # Include res dir from chips chips_dir := ../../../frameworks/opt/chips/res -#Include res dir from photoviewer +#Include res dir from libraries +appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat/res photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res gridlayout_dir := ../../../prebuilts/sdk/current/support/v7/gridlayout/res bitmap_dir := ../../../frameworks/opt/bitmap/res datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res -res_dirs := res $(chips_dir) $(photo_dir) $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir) +res_dirs := res $(appcompat_dir) $(chips_dir) $(photo_dir) $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir) ################################################## # Build APK @@ -36,6 +37,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES += guava LOCAL_STATIC_JAVA_LIBRARIES += android-common LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 LOCAL_STATIC_JAVA_LIBRARIES += android-opt-bitmap @@ -48,7 +50,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) \ $(call all-logtags-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.appcompat:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker LOCAL_PROGUARD_FLAG_FILES := proguard.flags |