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

Commit 552a6b87 authored by Walter Jang's avatar Walter Jang
Browse files

Remove discard editor menu option 

Also hide voicemail menu options for the me profile

Bug 25165475
Bug 25164540

Change-Id: I0c0dc318ac9bbe8a36656c2383091d7c9d4ce5cf
parent 6d3b45ed

res/menu/edit_contact.xml

+0 −5
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ 
        android:id="@+id/menu_join"

        android:title="@string/menu_joinAggregate" />



    <item

        android:id="@+id/menu_discard"

        android:alphabeticShortcut="q"

        android:title="@string/menu_discard" />



    <item

        android:id="@+id/menu_delete"

        android:title="@string/menu_deleteContact" />

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -207,9 +207,6 @@ 
    <!-- Confirmation dialog contents after users selects to delete a Writable contact. -->

    <string name="deleteConfirmation">This contact will be deleted.</string>



    <!-- Menu item to indicate you want to stop editing a contact and NOT save the changes you've made [CHAR LIMIT=30] -->

    <string name="menu_discard">Discard changes</string>



    <!-- Message displayed in a toast when you try to view the details of a contact that

         for some reason doesn't exist anymore. [CHAR LIMIT=NONE]-->

    <string name="invalidContactMessage">The contact doesn\'t exist.</string>

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

+1 −8
Original line number Diff line number Diff line
@@ -744,20 +744,15 @@ abstract public class ContactEditorBaseFragment extends Fragment implements 
        final MenuItem splitMenu = menu.findItem(R.id.menu_split);

        final MenuItem joinMenu = menu.findItem(R.id.menu_join);

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

        final MenuItem discardMenu = menu.findItem(R.id.menu_discard);

        final MenuItem sendToVoiceMailMenu = menu.findItem(R.id.menu_send_to_voicemail);

        final MenuItem ringToneMenu = menu.findItem(R.id.menu_set_ringtone);

        final MenuItem deleteMenu = menu.findItem(R.id.menu_delete);



        // Set visibility of menus

        // Discard menu is only available if at least one raw contact is editable

        discardMenu.setVisible(mState != null &&

                mState.getFirstWritableRawContact(mContext) != null);



        // help menu depending on whether this is inserting or editing

        if (isInsert(mAction) || mRawContactIdToDisplayAlone != -1) {

            HelpUtils.prepareHelpMenuItem(mContext, helpMenu, R.string.help_url_people_add);

            discardMenu.setVisible(false);

            splitMenu.setVisible(false);

            joinMenu.setVisible(false);

            deleteMenu.setVisible(false);
@@ -783,7 +778,7 @@ abstract public class ContactEditorBaseFragment extends Fragment implements 
        // Save menu is invisible when there's only one read only contact in the editor.

        saveMenu.setVisible(!mRawContactDisplayAloneIsReadOnly);



        if (mRawContactIdToDisplayAlone != -1) {

        if (mRawContactIdToDisplayAlone != -1 || mIsUserProfile) {

            sendToVoiceMailMenu.setVisible(false);

            ringToneMenu.setVisible(false);

        } else {
@@ -812,8 +807,6 @@ abstract public class ContactEditorBaseFragment extends Fragment implements 
        switch (item.getItemId()) {

            case R.id.menu_save:

                return save(SaveMode.CLOSE);

            case R.id.menu_discard:

                return revert();

            case R.id.menu_delete:

                if (mListener != null) mListener.onDeleteRequested(mLookupUri);

                return true;

src/com/android/contacts/group/GroupEditorFragment.java

+0 −18
Original line number Diff line number Diff line
@@ -514,24 +514,6 @@ public class GroupEditorFragment extends Fragment implements SelectAccountDialog 
        inflater.inflate(R.menu.edit_group, menu);

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        switch (item.getItemId()) {

            case R.id.menu_discard:

                return revert();

        }

        return false;

    }



    private boolean revert() {

        if (!hasNameChange() && !hasMembershipChange()) {

            doRevertAction();

        } else {

            CancelEditDialogFragment.show(this);

        }

        return true;

    }



    private void doRevertAction() {

        // When this Fragment is closed we don't want it to auto-save

        mStatus = Status.CLOSING;