Merge "Only display options to save and cancel edits to the displayed APN if the APN is editable."
This commit is contained in:
committed by
Android (Google) Code Review
commit
ad045f62ca
@@ -805,8 +805,11 @@ 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 && !mReadOnlyApn) {
|
if (!mNewApn) {
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user