commit 5fe9557ae4fdd7a1b70f27f7b1b6b4c096984d6a
author Wenyi Wang <wenyiw@google.com> Wed Feb 10 16:20:40 2016 -0800
committer Wenyi Wang <wenyiw@google.com> Thu Feb 11 21:24:26 2016 +0000
tree 26fa3a900c9f54afe7d3fbca97fa254c51bda74e
parent 9ff6a7caf65540c00e456e4d4a7354f8939ffd0c

Remove "Blocked Numbers Activity" from Contacts

This is almost a revert of ag/847363.
We also hide menu for now in PeopleActivity.

Bug 27118866

Change-Id: Ie242e2d1fcf00e7226a1f8e16c92c5d7620630e4
(cherry picked from commit 4bc3bd2aea6f053f5e9159a1ca5cd79e1d8887d8)

Android.mk

diff --git a/Android.mk b/Android.mk
index e4d7382..ad13292 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,8 +21,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 \
-    $(support_library_root_dir)/design/res
+    $(support_library_root_dir)/v7/cardview/res
 LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
 
 LOCAL_AAPT_FLAGS := \
@@ -30,7 +29,6 @@
     --extra-packages com.android.contacts.common \
     --extra-packages com.android.phone.common \
     --extra-packages android.support.v7.appcompat \
-    --extra-packages android.support.design \
     --extra-packages android.support.v7.cardview
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -42,7 +40,6 @@
     android-support-v7-cardview \
     android-support-v7-palette \
     android-support-v4 \
-    android-support-design \
     libphonenumber
 
 LOCAL_PACKAGE_NAME := Contacts