commit 5b1ffdcbc5f41189f54e69c4768e3e76ba2fce05
author John Shao <johnshao@google.com> Tue Nov 08 13:51:00 2016 -0800
committer John Shao <johnshao@google.com> Tue Nov 08 14:18:23 2016 -0800
tree 7e3bfe0b713a7cfd1a146e2eadcfe39784ad5c22
parent 7895220aa510853f24e06b910abdfd827b314986

Remove assistant experiment flag

See change I2959318e6f96365527d60cb9b1a7d539052a9c31

Bug: 32623647
Change-Id: If84828bb479d3096a5f58b1981252372c0cae7e9

src/com/android/contacts/ContactsDrawerActivity.java

diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index a56ce0d..325ecbe 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -47,7 +47,6 @@
 
 import com.android.contacts.activities.ActionBarAdapter;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.Experiments;
 import com.android.contacts.common.compat.CompatUtils;
 import com.android.contacts.common.list.AccountFilterActivity;
 import com.android.contacts.common.list.ContactListFilter;
@@ -78,7 +77,6 @@
 import com.android.contacts.util.SharedPreferenceUtil;
 import com.android.contactsbind.HelpUtils;
 import com.android.contactsbind.ObjectFactory;
-import com.android.contactsbind.experiments.Flags;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -264,8 +262,7 @@
     }
 
     private void initializeAssistantNewBadge() {
-        if (!Flags.getInstance().getBoolean(Experiments.ASSISTANT)
-                || mNavigationView == null) {
+        if (mNavigationView == null) {
             return;
         }
         final LinearLayout newBadgeFrame = (LinearLayout) MenuItemCompat.getActionView(
@@ -302,19 +299,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()) {
@@ -631,7 +619,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);