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

Commit 6367d2a3 authored by Walter Jang's avatar Walter Jang
Browse files

Fix imports after upstream commonbind package rename 

Test: Ran ContactsTests unit tests
Bug: 30759296

Change-Id: Ie86cbaa6591f959247764ef47fde9def1cdefd1f
parent c057c569

src-bind/com/android/contactsbind/experiments/Flags.java

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ package com.android.contactsbind.experiments; 


import android.content.Context;



import com.android.contacts.common.Experiments;



import java.util.HashMap;

import java.util.Map;

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

+1 −2
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import com.android.contacts.common.model.account.GoogleAccountType; 
import com.android.contacts.common.util.Constants;

import com.android.contacts.common.util.ImplicitIntentsUtil;

import com.android.contacts.common.widget.FloatingActionButtonController;

import com.android.contacts.commonbind.experiments.Flags;

import com.android.contacts.editor.EditorIntents;

import com.android.contacts.interactions.ContactDeletionInteraction;

import com.android.contacts.interactions.ContactMultiDeletionInteraction;
@@ -88,7 +87,6 @@ import com.android.contacts.list.ContactsIntentResolver; 
import com.android.contacts.list.ContactsRequest;

import com.android.contacts.list.ContactsUnavailableFragment;

import com.android.contacts.list.DefaultContactBrowseListFragment;

import com.android.contacts.list.DefaultContactBrowseListFragment.FeatureHighlightCallback;

import com.android.contacts.list.MultiSelectContactsListFragment.OnCheckBoxListActionListener;

import com.android.contacts.list.OnContactBrowserActionListener;

import com.android.contacts.list.OnContactsUnavailableActionListener;
@@ -96,6 +94,7 @@ import com.android.contacts.quickcontact.QuickContactActivity; 
import com.android.contacts.util.DialogManager;

import com.android.contacts.util.SharedPreferenceUtil;

import com.android.contacts.util.SyncUtil;

import com.android.contactsbind.experiments.Flags;

import com.google.android.libraries.material.featurehighlight.FeatureHighlight;



import java.util.List;

src/com/android/contacts/list/DefaultContactBrowseListFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.database.Cursor; 
import android.net.Uri;

import android.os.Bundle;

import android.provider.ContactsContract;

import android.support.v4.widget.SwipeRefreshLayout;

import android.provider.ContactsContract.Directory;

import android.support.v4.widget.SwipeRefreshLayout;

import android.text.TextUtils;

import android.view.Gravity;

import android.view.LayoutInflater;
@@ -48,8 +48,8 @@ import com.android.contacts.common.list.DefaultContactListAdapter; 
import com.android.contacts.common.list.FavoritesAndContactsLoader;

import com.android.contacts.common.model.AccountTypeManager;

import com.android.contacts.common.model.account.AccountWithDataSet;

import com.android.contacts.commonbind.experiments.Flags;

import com.android.contacts.util.SyncUtil;

import com.android.contactsbind.experiments.Flags;



import java.util.List;