Revert change: Edit action screen, if the action name is available for editing, we should not show the "Show/hide – " part, because after deleting or changing this part it appears on the quick action bar anyway.
https://github.com/osmandapp/OsmAnd/issues/10196
This commit is contained in:
parent
2277d6c4ea
commit
67a2a447e7
1 changed files with 3 additions and 11 deletions
|
@ -220,17 +220,9 @@ public class CreateEditActionDialog extends DialogFragment
|
|||
nameEditText.setEnabled(action.isActionEditable());
|
||||
action.setAutoGeneratedTitle(nameEditText);
|
||||
|
||||
if (savedInstanceState == null) {
|
||||
String name = action.getName(getContext());
|
||||
if (action.getActionNameRes() != 0) {
|
||||
String actionName = getString(action.getActionNameRes());
|
||||
nameEditText.setText(getString(R.string.ltr_or_rtl_combine_via_dash, actionName, name));
|
||||
} else {
|
||||
nameEditText.setText(name);
|
||||
}
|
||||
} else {
|
||||
action.setName(nameEditText.getText().toString());
|
||||
}
|
||||
if (savedInstanceState == null) nameEditText.setText(action.getName(getContext()));
|
||||
else action.setName(nameEditText.getText().toString());
|
||||
|
||||
image.setImageResource(action.getIconRes(getApplication()));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue