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

Return unmodified string and fix format

Browse source
This commit is contained in:
Zahnstocher 2014-08-09 13:15:59 +02:00
parent dcfb4f9089
commit 59842c2209
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
View file

@ -155,8 +155,8 @@ public abstract class SettingsBaseActivity extends SherlockPreferenceActivity im
public static String getStringPropertyValue(Context ctx, String propertyValue) { public static String getStringPropertyValue(Context ctx, String propertyValue) {
try { try {
propertyValue = propertyValue.replaceAll("\\s+","_"); final String propertyValueReplaced = propertyValue.replaceAll("\\s+","_");
Field f = R.string.class.getField("rendering_value_" + propertyValue + "_name"); Field f = R.string.class.getField("rendering_value_" + propertyValueReplaced + "_name");
if (f != null) { if (f != null) {
Integer in = (Integer) f.get(null); Integer in = (Integer) f.get(null);
return ctx.getString(in); return ctx.getString(in);

12
OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java
View file

@ -207,15 +207,15 @@ public class AppearanceWidgetsFactory {
public void run() { public void run() {
AlertDialog.Builder b = new AlertDialog.Builder(view.getContext()); AlertDialog.Builder b = new AlertDialog.Builder(view.getContext());
//test old descr as title //test old descr as title
b.setTitle(propertyDescr); b.setTitle(propertyDescr);
int i = Arrays.asList(p.getPossibleValues()).indexOf(pref.get()); int i = Arrays.asList(p.getPossibleValues()).indexOf(pref.get());
String[] possibleValuesString = new String[p.getPossibleValues().length]; String[] possibleValuesString = new String[p.getPossibleValues().length];
for (int j = 0; j < p.getPossibleValues().length; j++) { for (int j = 0; j < p.getPossibleValues().length; j++) {
possibleValuesString[j] = SettingsActivity.getStringPropertyValue(view.getContext(), p.getPossibleValues()[j]); possibleValuesString[j] = SettingsActivity.getStringPropertyValue(view.getContext(), p.getPossibleValues()[j]);
} }
b.setSingleChoiceItems(possibleValuesString, i, new DialogInterface.OnClickListener() { b.setSingleChoiceItems(possibleValuesString, i, new DialogInterface.OnClickListener() {
@Override @Override