summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2013-05-21 13:18:56 -0700
committerAndrew Sapperstein <asapperstein@google.com>2013-05-21 23:52:43 +0000
commit0f50f3d2c7046bd27a6c78bc255bb64e1face2d4 (patch)
tree675d37025bf7ae86e206f58b4672f88fb9def5a8 /Android.mk
parent4b8af5084583813f5588e20ae681ec3653ca99be (diff)
downloadandroid_packages_apps_UnifiedEmail-0f50f3d2c7046bd27a6c78bc255bb64e1face2d4.tar.gz
android_packages_apps_UnifiedEmail-0f50f3d2c7046bd27a6c78bc255bb64e1face2d4.tar.bz2
android_packages_apps_UnifiedEmail-0f50f3d2c7046bd27a6c78bc255bb64e1face2d4.zip
Adding drag-state drawable to folder item icons.
Fixes b/8986628. Previously we had two states for icons in the folder list (activated and default). We now have a third state for when the app is in drag mode and the folder is disabled which uses a lighter grey icon. To make this work, we use a custom drawable state (state_drag_mode) for when drag is entered. Another CL will use this new drag state for changing folder text color as well. Change-Id: I280b187a454064f1c50f4ef62db5c8ba86c1f4d6 (cherry picked from commit 47fb86e95836e1a47bd784f6866c8c798b44ab6b)
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index a1c9cb67d..1cf0bb6f9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,7 @@ LOCAL_SDK_VERSION := current
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_PATH)/res
+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