resolve merge conflicts of 5b1ffdc to ub-contactsdialer-master-dev
Change-Id: I73be19a553bf9a18a5a9a9b2b83c43be810d7de7
diff --git a/res/menu/activity_main_drawer.xml b/res/menu/activity_main_drawer.xml
index 877c726..8d02e4d 100644
--- a/res/menu/activity_main_drawer.xml
+++ b/res/menu/activity_main_drawer.xml
@@ -29,10 +29,6 @@
app:actionViewClass="android.widget.LinearLayout"
android:icon="@drawable/ic_assistant"
android:title="@string/menu_assistant"/>
- <item
- android:id="@+id/nav_find_duplicates"
- android:icon="@drawable/ic_menu_duplicates"
- android:title="@string/menu_duplicates"/>
</group>
<group android:id="@+id/groups">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c4ee83..4678419 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -928,9 +928,6 @@
<!-- Left drawer menu item to open contacts assistant/suggestion cards. [CHAR LIMIT=20]-->
<string name="menu_assistant">Suggestions</string>
- <!-- The menu item to open the link/merge duplicates activity. [CHAR LIMIT=20]-->
- <string name="menu_duplicates">Duplicates</string>
-
<!-- Badge shown next to Suggestions in left drawer menu when user has not visited it yet. [CHAR LIMIT=10] -->
<string name="menu_assistant_new_badge">New</string>
diff --git a/src-bind/com/android/contactsbind/ObjectFactory.java b/src-bind/com/android/contactsbind/ObjectFactory.java
index e55b7a8..1b4fc62 100644
--- a/src-bind/com/android/contactsbind/ObjectFactory.java
+++ b/src-bind/com/android/contactsbind/ObjectFactory.java
@@ -41,11 +41,7 @@
return new DeviceLocalAccountTypeFactory.Default(context);
}
- public static Fragment getAssistantFragment(String tag) {
- return null;
- }
-
- public static Fragment getDuplicatesUtilFragment() {
+ public static Fragment getAssistantFragment() {
return null;
}
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index e4ffc5e..770298e 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -285,8 +285,7 @@
}
private void initializeAssistantNewBadge() {
- if (!Flags.getInstance().getBoolean(Experiments.ASSISTANT)
- || mNavigationView == null) {
+ if (mNavigationView == null) {
return;
}
final LinearLayout newBadgeFrame = (LinearLayout) MenuItemCompat.getActionView(
@@ -323,19 +322,10 @@
private void setUpMenu() {
final Menu menu = mNavigationView.getMenu();
- if (ObjectFactory.getDuplicatesUtilFragment() == null) {
+ if (ObjectFactory.getAssistantFragment() == null) {
menu.removeItem(R.id.nav_assistant);
- menu.removeItem(R.id.nav_find_duplicates);
} else {
- int id;
- if (Flags.getInstance().getBoolean(Experiments.ASSISTANT)) {
- id = R.id.nav_assistant;
- menu.removeItem(R.id.nav_find_duplicates);
- } else {
- id = R.id.nav_find_duplicates;
- menu.removeItem(R.id.nav_assistant);
- }
-
+ final int id = R.id.nav_assistant;
final MenuItem assistantMenu = menu.findItem(id);
mIdMenuMap.put(id, assistantMenu);
if (isAssistantView()) {
@@ -739,7 +729,7 @@
HelpUtils.launchHelpAndFeedbackForMainScreen(ContactsDrawerActivity.this);
} else if (id == R.id.nav_all_contacts) {
switchToAllContacts();
- } else if (id == R.id.nav_assistant || id == R.id.nav_find_duplicates) {
+ } else if (id == R.id.nav_assistant) {
if (!isAssistantView()) {
launchAssistant();
updateMenuSelection(item);
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 5d5a8bf..15c95c7 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -843,29 +843,11 @@
transaction.replace(
R.id.contacts_list_container, mMembersFragment, TAG_GROUP_VIEW);
} else if (isAssistantView()) {
- String fragmentTag;
- if (Flags.getInstance().getBoolean(Experiments.ASSISTANT)) {
- fragmentTag = TAG_ASSISTANT;
- } else {
- fragmentTag = TAG_DUPLICATES;
- }
-
- Fragment uiFragment = fragmentManager.findFragmentByTag(fragmentTag);
+ Fragment uiFragment = fragmentManager.findFragmentByTag(TAG_ASSISTANT);
if (uiFragment == null) {
- uiFragment = ObjectFactory.getAssistantFragment(fragmentTag);
+ uiFragment = ObjectFactory.getAssistantFragment();
}
- transaction.replace(R.id.contacts_list_container, uiFragment, fragmentTag);
-
- if (!Flags.getInstance().getBoolean(Experiments.ASSISTANT)) {
- Fragment duplicatesUtilFragment =
- fragmentManager.findFragmentByTag(TAG_DUPLICATES_UTIL);
- if (duplicatesUtilFragment == null) {
- duplicatesUtilFragment = ObjectFactory.getDuplicatesUtilFragment();
- }
- if (!duplicatesUtilFragment.isAdded()) {
- transaction.add(duplicatesUtilFragment, TAG_DUPLICATES_UTIL);
- }
- }
+ transaction.replace(R.id.contacts_list_container, uiFragment, TAG_ASSISTANT);
resetToolBarStatusBarColor();
}
transaction.addToBackStack(TAG_SECOND_LEVEL);
diff --git a/src/com/android/contacts/common/Experiments.java b/src/com/android/contacts/common/Experiments.java
index 5891fdb..1a7fe2e 100644
--- a/src/com/android/contacts/common/Experiments.java
+++ b/src/com/android/contacts/common/Experiments.java
@@ -26,11 +26,6 @@
public static final String ACCOUNT_SWITCHER = "Account__account_switcher_enable";
/**
- * Experiment to enable assistant in left navigation drawer.
- */
- public static final String ASSISTANT = "Assistant__enable_assistant";
-
- /**
* Whether to open contact sheet (aka smart profile) instead of our own QuickContact.
*/
public static final String CONTACT_SHEET = "QuickContact__contact_sheet";
diff --git a/src/com/android/contacts/common/database/SimContactDao.java b/src/com/android/contacts/common/database/SimContactDao.java
index 7c8b6a0..89b4a3f 100644
--- a/src/com/android/contacts/common/database/SimContactDao.java
+++ b/src/com/android/contacts/common/database/SimContactDao.java
@@ -94,9 +94,7 @@
}
public void warmupSimQueryIfNeeded() {
- // Not needed if we don't have an Assistant section
- if (!Flags.getInstance().getBoolean(Experiments.ASSISTANT) ||
- !canReadSimContacts()) return;
+ if (!canReadSimContacts()) return;
new AsyncTask<Void, Void, Void>() {
@Override