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

Merge pull request #11250 from osmandapp/Quick-action-fix

Browse source 
Quick action fix
This commit is contained in:
Vitaliy 2021-03-25 14:39:29 +02:00 committed by GitHub
commit a0be550d04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -222,15 +222,16 @@ public class CreateEditActionDialog extends DialogFragment
if (savedInstanceState == null) { if (savedInstanceState == null) {
String name = action.getName(getContext()); String name = action.getName(getContext());
if (action.getActionNameRes() != 0) { if (!action.isActionEditable() && action.getActionNameRes() != 0
&& !name.contains(getString(action.getActionNameRes()))) {
String actionName = getString(action.getActionNameRes()); String actionName = getString(action.getActionNameRes());
nameEditText.setText(getString(R.string.ltr_or_rtl_combine_via_dash, actionName, name)); nameEditText.setText(getString(R.string.ltr_or_rtl_combine_via_dash, actionName, name));
} else { } else {
nameEditText.setText(name); nameEditText.setText(name);
} }
} else { } else {
action.setName(nameEditText.getText().toString()); action.setName(nameEditText.getText().toString());
} }
image.setImageResource(action.getIconRes(getApplication())); image.setImageResource(action.getIconRes(getApplication()));
} }