PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jeremy Goldman
2020-10-23 04:58:49 +00:00
parent f36154fe6c
commit 7a16e45290
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3683,7 +3683,7 @@
<!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage --> <!-- 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> <string name="menu_save">Save</string>
<!-- Edit access point screen menu option to discard the user's changes for this APN --> <!-- 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 --> <!-- APN error dialog title -->
<string name="error_title"></string> <string name="error_title"></string>
<!-- APN error dialog messages: --> <!-- APN error dialog messages: -->

11
src/com/android/settings/network/apn/ApnEditor.java
View File

@@ -805,16 +805,15 @@ public class ApnEditor extends SettingsPreferenceFragment
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater); super.onCreateOptionsMenu(menu, inflater);
if (mReadOnlyApn) {
return;
}
// If it's a new APN, then cancel will delete the new entry in onPause // 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) menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
.setIcon(R.drawable.ic_delete); .setIcon(R.drawable.ic_delete);
} }
menu.add(0, MENU_SAVE, 0, R.string.menu_save) if (!mReadOnlyApn) {
.setIcon(android.R.drawable.ic_menu_save); 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) menu.add(0, MENU_CANCEL, 0, R.string.menu_cancel)
.setIcon(android.R.drawable.ic_menu_close_clear_cancel); .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
} }