Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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.

Browse source 
https://github.com/osmandapp/OsmAnd/issues/10196
This commit is contained in:
androiddevkotlin 2021-03-25 00:36:40 +02:00
parent 2277d6c4ea
commit 67a2a447e7
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java
View file

@ -220,17 +220,9 @@ public class CreateEditActionDialog extends DialogFragment
nameEditText.setEnabled(action.isActionEditable()); nameEditText.setEnabled(action.isActionEditable());
action.setAutoGeneratedTitle(nameEditText); action.setAutoGeneratedTitle(nameEditText);
if (savedInstanceState == null) { if (savedInstanceState == null) nameEditText.setText(action.getName(getContext()));
String name = action.getName(getContext()); else action.setName(nameEditText.getText().toString());
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());
}
image.setImageResource(action.getIconRes(getApplication())); image.setImageResource(action.getIconRes(getApplication()));
} }