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

Commit 2cf38962 authored by Wenyi Wang's avatar Wenyi Wang Committed by Walter Jang
Browse files

Merge contacts src-N/ and src-pre-N/ dirs (1/3) 

Bug 30124466

(cherry picked from commit 5289a29b)

Change-Id: I2ad91c9148132f80eca588cc0458ef6158bc37ac
parent 0b7ace41

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src 
res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res

asset_dirs := $(contacts_common_dir)/assets



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/cardview/res

src/com/android/contacts/activities/PeopleActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.graphics.Rect; 
import android.net.Uri;

import android.os.Bundle;

import android.os.Parcelable;

import android.provider.BlockedNumberContract;

import android.provider.ContactsContract;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.ProviderStatus;
@@ -58,7 +59,6 @@ import com.android.contacts.activities.ActionBarAdapter.TabState; 
import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.activity.RequestPermissionsActivity;

import com.android.contacts.common.compat.TelecomManagerUtil;

import com.android.contacts.common.compat.BlockedNumberContractCompat;

import com.android.contacts.common.dialog.ClearFrequentsDialog;

import com.android.contacts.common.interactions.ImportExportDialogFragment;

import com.android.contacts.common.list.ContactEntryListFragment;
@@ -1103,7 +1103,7 @@ public class PeopleActivity extends ContactsActivity implements 
        final boolean showMiscOptions = !isSearchOrSelectionMode;

        final boolean showBlockedNumbers = PhoneCapabilityTester.isPhone(this)

                && ContactsUtils.FLAG_N_FEATURE

                && BlockedNumberContractCompat.canCurrentUserBlockNumbers(this);

                && BlockedNumberContract.canCurrentUserBlockNumbers(this);

        makeMenuItemVisible(menu, R.id.menu_search, showMiscOptions);

        makeMenuItemVisible(menu, R.id.menu_import_export, showMiscOptions);

        makeMenuItemVisible(menu, R.id.menu_accounts, showMiscOptions);