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

Commit eee82fea authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4442369 from 7375d813 to pi-release 

Change-Id: I80705a37bd67644d930058482412e3a5f231b670
parents acf67be6 7375d813

src/com/android/contacts/drawer/DrawerAdapter.java

+5 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.contacts.list.ContactListFilter; 
import com.android.contacts.model.account.AccountDisplayInfo;

import com.android.contacts.model.account.AccountDisplayInfoFactory;

import com.android.contacts.util.SharedPreferenceUtil;

import com.android.contactsbind.HelpUtils;

import com.android.contactsbind.ObjectFactory;



import java.util.ArrayList;
@@ -118,8 +119,10 @@ public class DrawerAdapter extends BaseAdapter { 
        mMiscItems.add(new DividerItem());

        mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings,

                R.drawable.quantum_ic_settings_vd_theme_24));

        if (HelpUtils.isHelpAndFeedbackAvailable()) {

            mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,

                    R.drawable.quantum_ic_help_vd_theme_24));

        }

        rebuildItemsList();

    }

src/com/android/contacts/editor/ContactEditorFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -747,6 +747,9 @@ public class ContactEditorFragment extends Fragment implements 
            });

        }



        final MenuItem helpMenu = menu.findItem(R.id.menu_help);

        helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable());



        int size = menu.size();

        for (int i = 0; i < size; i++) {

            menu.getItem(i).setEnabled(mEnabled);

src/com/android/contacts/quickcontact/QuickContactActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -1033,8 +1033,6 @@ public class QuickContactActivity extends ContactsActivity { 
            mCachedCp2DataCardModel = null;

        }

        mContactLoader.forceLoad();



        NfcHandler.register(this, mLookupUri);

    }



    private void destroyInteractionLoaders() {
@@ -1157,6 +1155,7 @@ public class QuickContactActivity extends ContactsActivity { 
            }

        };

        mEntriesAndActionsTask.execute();

        NfcHandler.register(this, mContactData.getLookupUri());

    }



    private void bindDataToCards(Cp2DataCardModel cp2DataCardModel) {