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

Commit c683d227 authored by Tingting Wang's avatar Tingting Wang
Browse files

Fix bug when showing overflow menu in Compact editor. 

Set default value for rawContact id to display alone.

BUG 24899070

Change-Id: Ibdb25080e62f669f9c466bf55e67dbbe63ff6afb
parent a0b69409

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

+1 −1
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ abstract public class ContactEditorBaseFragment extends Fragment implements 
            }

            mPhotoId = mIntentExtras.getLong(INTENT_EXTRA_PHOTO_ID);

            mRawContactIdToDisplayAlone = mIntentExtras.getLong(

                    INTENT_EXTRA_RAW_CONTACT_ID_TO_DISPLAY_ALONE);

                    INTENT_EXTRA_RAW_CONTACT_ID_TO_DISPLAY_ALONE, -1);

            mRawContactDisplayAloneIsReadOnly = mIntentExtras.getBoolean(

                    INTENT_EXTRA_RAW_CONTACT_DISPLAY_ALONE_IS_READ_ONLY);

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements 
            mCurrentPhotoUri = savedState.getParcelable(KEY_CURRENT_PHOTO_URI);

            mUpdatedPhotos = savedState.getParcelable(KEY_UPDATED_PHOTOS);

            mRawContactIdToDisplayAlone = savedState.getLong(

                    ContactEditorBaseFragment.INTENT_EXTRA_RAW_CONTACT_ID_TO_DISPLAY_ALONE);

                    ContactEditorBaseFragment.INTENT_EXTRA_RAW_CONTACT_ID_TO_DISPLAY_ALONE, -1);

        }

    }
@@ -123,7 +123,7 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements 
        super.load(action, lookupUri, intentExtras);

        if (intentExtras != null) {

            mRawContactIdToDisplayAlone = intentExtras.getLong(

                    ContactEditorBaseFragment.INTENT_EXTRA_RAW_CONTACT_ID_TO_DISPLAY_ALONE);

                    ContactEditorBaseFragment.INTENT_EXTRA_RAW_CONTACT_ID_TO_DISPLAY_ALONE, -1);

        }

    }