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

Commit 5b1ffdcb authored by John Shao's avatar John Shao
Browse files

Remove assistant experiment flag 

See change I2959318e6f96365527d60cb9b1a7d539052a9c31

Bug: 32623647
Change-Id: If84828bb479d3096a5f58b1981252372c0cae7e9
parent 7895220a

res/menu/activity_main_drawer.xml

+0 −4
Original line number Original line Diff line number Diff line
@@ -29,10 +29,6 @@ 
            app:actionViewClass="android.widget.LinearLayout"

            app:actionViewClass="android.widget.LinearLayout"

            android:icon="@drawable/ic_assistant"

            android:icon="@drawable/ic_assistant"

            android:title="@string/menu_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>





    <group android:id="@+id/groups">

    <group android:id="@+id/groups">

res/values/strings.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -928,9 +928,6 @@ 
    <!-- Left drawer menu item to open contacts assistant/suggestion cards. [CHAR LIMIT=20]-->

    <!-- Left drawer menu item to open contacts assistant/suggestion cards. [CHAR LIMIT=20]-->

    <string name="menu_assistant">Suggestions</string>

    <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] -->

    <!-- 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>

    <string name="menu_assistant_new_badge">New</string>

src-bind/com/android/contactsbind/ObjectFactory.java

+1 −5
Original line number Original line Diff line number Diff line
@@ -39,11 +39,7 @@ public class ObjectFactory { 
        return new DeviceLocalAccountTypeFactory.Default(context);

        return new DeviceLocalAccountTypeFactory.Default(context);

    }

    }





    public static Fragment getAssistantFragment(String tag) {

    public static Fragment getAssistantFragment() {

        return null;

    }



    public static Fragment getDuplicatesUtilFragment() {

        return null;

        return null;

    }

    }

src/com/android/contacts/ContactsDrawerActivity.java

+4 −16
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ import android.widget.Toast; 




import com.android.contacts.activities.ActionBarAdapter;

import com.android.contacts.activities.ActionBarAdapter;

import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.Experiments;

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

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

import com.android.contacts.common.list.AccountFilterActivity;

import com.android.contacts.common.list.AccountFilterActivity;

import com.android.contacts.common.list.ContactListFilter;

import com.android.contacts.common.list.ContactListFilter;
@@ -78,7 +77,6 @@ import com.android.contacts.list.MultiSelectContactsListFragment; 
import com.android.contacts.util.SharedPreferenceUtil;

import com.android.contacts.util.SharedPreferenceUtil;

import com.android.contactsbind.HelpUtils;

import com.android.contactsbind.HelpUtils;

import com.android.contactsbind.ObjectFactory;

import com.android.contactsbind.ObjectFactory;

import com.android.contactsbind.experiments.Flags;





import java.util.HashMap;

import java.util.HashMap;

import java.util.Iterator;

import java.util.Iterator;
@@ -264,8 +262,7 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i 
    }

    }





    private void initializeAssistantNewBadge() {

    private void initializeAssistantNewBadge() {

        if (!Flags.getInstance().getBoolean(Experiments.ASSISTANT)

        if (mNavigationView == null) {

                || mNavigationView == null) {

            return;

            return;

        }

        }

        final LinearLayout newBadgeFrame = (LinearLayout) MenuItemCompat.getActionView(

        final LinearLayout newBadgeFrame = (LinearLayout) MenuItemCompat.getActionView(
@@ -302,19 +299,10 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i 
    private void setUpMenu() {

    private void setUpMenu() {

        final Menu menu = mNavigationView.getMenu();

        final Menu menu = mNavigationView.getMenu();





        if (ObjectFactory.getDuplicatesUtilFragment() == null) {

        if (ObjectFactory.getAssistantFragment() == null) {

            menu.removeItem(R.id.nav_assistant);

            menu.removeItem(R.id.nav_assistant);

            menu.removeItem(R.id.nav_find_duplicates);

        } else {

        } else {

            int id;

            final int id = R.id.nav_assistant;

            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 MenuItem assistantMenu = menu.findItem(id);

            final MenuItem assistantMenu = menu.findItem(id);

            mIdMenuMap.put(id, assistantMenu);

            mIdMenuMap.put(id, assistantMenu);

            if (isAssistantView()) {

            if (isAssistantView()) {
@@ -631,7 +619,7 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i 
                    HelpUtils.launchHelpAndFeedbackForMainScreen(ContactsDrawerActivity.this);

                    HelpUtils.launchHelpAndFeedbackForMainScreen(ContactsDrawerActivity.this);

                } else if (id == R.id.nav_all_contacts) {

                } else if (id == R.id.nav_all_contacts) {

                    switchToAllContacts();

                    switchToAllContacts();

                } else if (id == R.id.nav_assistant || id == R.id.nav_find_duplicates) {

                } else if (id == R.id.nav_assistant) {

                    if (!isAssistantView()) {

                    if (!isAssistantView()) {

                        launchAssistant();

                        launchAssistant();

                        updateMenuSelection(item);

                        updateMenuSelection(item);

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

+3 −21
Original line number Original line Diff line number Diff line
@@ -828,29 +828,11 @@ public class PeopleActivity extends ContactsDrawerActivity { 
            transaction.replace(

            transaction.replace(

                    R.id.contacts_list_container, mMembersFragment, TAG_GROUP_VIEW);

                    R.id.contacts_list_container, mMembersFragment, TAG_GROUP_VIEW);

        } else if (isAssistantView()) {

        } else if (isAssistantView()) {

            String fragmentTag;

            Fragment uiFragment = fragmentManager.findFragmentByTag(TAG_ASSISTANT);

            if (Flags.getInstance().getBoolean(Experiments.ASSISTANT)) {

                fragmentTag = TAG_ASSISTANT;

            } else {

                fragmentTag = TAG_DUPLICATES;

            }



            Fragment uiFragment = fragmentManager.findFragmentByTag(fragmentTag);

            if (uiFragment == null) {

            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();

            resetToolBarStatusBarColor();

        }

        }

        transaction.addToBackStack(TAG_SECOND_LEVEL);

        transaction.addToBackStack(TAG_SECOND_LEVEL);