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

Commit 41c6886c authored by John Shao's avatar John Shao
Browse files

Force intents to start in app wherever possible 

Add class/package names wherever possible for intents that are
started within the app itself. This is to avoid the intents picker
dialog that makes the user choose which app to handle the intent.

Bug: 30601104
Change-Id: I98d3a5a5c2112f1ba0c944b37c9b6754837dfa9c
parent 1ce6ad92

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

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ abstract public class ContactEditorBaseActivity extends ContactsActivity 
        public void onEditOtherContactRequested(

                Uri contactLookupUri, ArrayList<ContentValues> values) {

            final Intent intent = EditorIntents.createEditOtherContactIntent(

                    contactLookupUri, values);

                    ContactEditorBaseActivity.this, contactLookupUri, values);

            ImplicitIntentsUtil.startActivityInApp(ContactEditorBaseActivity.this, intent);

            finish();

        }

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

+4 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.contacts.common.list.DirectoryListLoader; 
import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;

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

import com.android.contacts.common.logging.ListEvent;

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

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

import com.android.contacts.editor.EditorIntents;

import com.android.contacts.list.ContactPickerFragment;
@@ -493,7 +494,8 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen 
        @Override

        public void onEditContactAction(Uri contactLookupUri) {

            startActivityAndForwardResult(EditorIntents.createEditContactIntent(

                    contactLookupUri, /* materialPalette =*/ null, /* photoId =*/ -1));

                    ContactSelectionActivity.this, contactLookupUri, /* materialPalette =*/ null,

                    /* photoId =*/ -1));

        }



        @Override
@@ -603,7 +605,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen 
            intent.putExtras(extras);

        }

        try {

            startActivity(intent);

            ImplicitIntentsUtil.startActivityInApp(ContactSelectionActivity.this, intent);

        } catch (ActivityNotFoundException e) {

            Log.e(TAG, "startActivity() failed: " + e);

            Toast.makeText(ContactSelectionActivity.this, R.string.missing_app,

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

+2 −2
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements 
    }



    public void startGroupAddMemberActivity() {

        startActivityForResult(GroupUtil.createPickMemberIntent(mGroupMetadata,

        startActivityForResult(GroupUtil.createPickMemberIntent(this, mGroupMetadata,

                mMembersFragment.getMemberContactIds()), RESULT_GROUP_ADD_MEMBER);

    }
@@ -596,7 +596,7 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements 
        final int count = mMembersFragment.getAdapter().getCount();

        Logger.logListEvent(ListEvent.ActionType.CLICK, ListEvent.ListType.GROUP, count,

                /* clickedIndex */ position, /* numSelected */ 0);

        final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(

        final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(this,

                contactLookupUri, QuickContactActivity.MODE_FULLY_EXPANDED);

        intent.putExtra(QuickContactActivity.EXTRA_PREVIOUS_SCREEN_TYPE, ScreenType.LIST_GROUP);

        startActivity(intent);

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

+5 −3
Original line number Diff line number Diff line
@@ -312,7 +312,8 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
        switch (mRequest.getActionCode()) {

            case ContactsRequest.ACTION_VIEW_CONTACT: {

                final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(

                        mRequest.getContactUri(), QuickContactActivity.MODE_FULLY_EXPANDED);

                        PeopleActivity.this, mRequest.getContactUri(),

                        QuickContactActivity.MODE_FULLY_EXPANDED);

                intent.putExtra(QuickContactActivity.EXTRA_PREVIOUS_SCREEN_TYPE, ScreenType.UNKNOWN);

                ImplicitIntentsUtil.startActivityInApp(this, intent);

                return false;
@@ -1029,7 +1030,8 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
                        QuickContactActivity.MODE_FULLY_EXPANDED, null);

            } else {

                final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(

                        contactLookupUri, QuickContactActivity.MODE_FULLY_EXPANDED);

                        PeopleActivity.this, contactLookupUri,

                        QuickContactActivity.MODE_FULLY_EXPANDED);

                final int previousScreen;

                if (mAllFragment.isSearchMode()) {

                    previousScreen = ScreenType.SEARCH;
@@ -1106,7 +1108,7 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
        @Override

        public void onCreateNewContactAction() {

            ImplicitIntentsUtil.startActivityInApp(PeopleActivity.this,

                    EditorIntents.createCompactInsertContactIntent());

                    EditorIntents.createCompactInsertContactIntent(PeopleActivity.this));

        }



        @Override

src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -303,7 +303,8 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment 
            final Intent intent;

            if (mHasProfile) {

                final Uri uri = ContentUris.withAppendedId(Contacts.CONTENT_URI, mProfileContactId);

                intent = ImplicitIntentsUtil.composeQuickContactIntent(uri, mModeFullyExpanded);

                intent = ImplicitIntentsUtil.composeQuickContactIntent(getContext(), uri,

                        mModeFullyExpanded);

                intent.putExtra(mPreviousScreenExtra, ScreenType.ME_CONTACT);

            } else {

                intent = new Intent(Intent.ACTION_INSERT, Contacts.CONTENT_URI);