Merge "Update string for discarding changes to a particular APN's settings."
This commit is contained in:
committed by
Android (Google) Code Review
commit
e092a54381
@@ -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);
|
||||
}
|
||||
menu.add(0, MENU_SAVE, 0, R.string.menu_save)
|
||||
.setIcon(android.R.drawable.ic_menu_save);
|
||||
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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user