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

Commit 7a16e452 authored by Jeremy Goldman's avatar Jeremy Goldman
Browse files

Update string for discarding changes to a particular APN's settings. 

Previously was unclear whether the changes, or the entire APN was
being discarded. The word "Cancel" more closely implies that the most
recent changes to the screen will be discarded rather than the entire
APN.

This only changes the resource for english. However, many other
languages have a menu_cancel string that seems much closer
to "Cancel" than "Discard" as well.

i.e. http://cs/android/packages/apps/Settings/res/values-zu/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb
http://cs/android/packages/apps/Settings/res/values-es/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb

Bug: 171538880
Test: N/A
Change-Id: I80fde04dbc36078d5c53e68231fcc4e5c3cf94e6
parent f36154fe

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -3683,7 +3683,7 @@ 
    <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->

    <string name="menu_save">Save</string>

    <!-- Edit access point screen menu option to discard the user's changes for this APN -->

    <string name="menu_cancel">Discard</string>

    <string name="menu_cancel">Cancel</string>

    <!-- APN error dialog title -->

    <string name="error_title"></string>

    <!-- APN error dialog messages: -->

src/com/android/settings/network/apn/ApnEditor.java

+5 −6
Original line number Diff line number Diff line
@@ -805,16 +805,15 @@ public class ApnEditor extends SettingsPreferenceFragment 
    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        super.onCreateOptionsMenu(menu, inflater);

        if (mReadOnlyApn) {

            return;

        }

        // If it's a new APN, then cancel will delete the new entry in onPause

        if (!mNewApn) {

        if (!mNewApn && !mReadOnlyApn) {

            menu.add(0, MENU_DELETE, 0, R.string.menu_delete)

                .setIcon(R.drawable.ic_delete);

        }

        if (!mReadOnlyApn) {

            menu.add(0, MENU_SAVE, 0, R.string.menu_save)

                .setIcon(android.R.drawable.ic_menu_save);

        }

        menu.add(0, MENU_CANCEL, 0, R.string.menu_cancel)

            .setIcon(android.R.drawable.ic_menu_close_clear_cancel);

    }