Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f1e441c authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove "Blocked Numbers Activity" from Contacts" into nyc-dev

parents 0b117408 5fe9557a

Android.mk

+1 −4
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ src_dirs += src-N $(contacts_common_dir)/src-N $(phone_common_dir)/src-N 
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 @@ LOCAL_AAPT_FLAGS := \ 
    --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 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android-support-v7-cardview \

    android-support-v7-palette \

    android-support-v4 \

    android-support-design \

    libphonenumber



LOCAL_PACKAGE_NAME := Contacts

AndroidManifest.xml

+0 −11
Original line number Diff line number Diff line
@@ -418,17 +418,6 @@ 
            </intent-filter>

        </activity>



        <!-- Blocked numbers activity -->

        <activity android:name=".activities.BlockedNumbersActivity"

                  android:label="@string/blocked_numbers_title"

                  android:theme="@style/BlockedNumbersStyle">

            <intent-filter>

                <action android:name="android.intent.action.EDIT" />

                <data android:mimeType="blocked_numbers/*" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!-- vCard related -->

        <activity android:name=".common.vcard.ImportVCardActivity"

            android:label="@string/launcherActivityLabel"

res/drawable-hdpi/empty_contacts.png

deleted100644 → 0
−2.4 KiB
Loading image diff...

res/drawable-hdpi/ic_not_interested_googblue_24dp.png

deleted100644 → 0
−565 B
Loading image diff...

res/drawable-hdpi/ic_remove.png

deleted100644 → 0
−884 B
Loading image diff...