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

Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
PavelRatushnyi 2018-01-12 17:52:57 +02:00
commit 600ac59623
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java
View file

@ -1,7 +1,6 @@
package net.osmand.plus.osmedit; package net.osmand.plus.osmedit;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
@ -43,7 +42,7 @@ public class EditPOIMenuController extends MenuController {
} }
}; };
leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_upload); leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_upload);
leftTitleButtonController.leftIconId = R.drawable.ic_action_export; leftTitleButtonController.updateStateListDrawableIcon(R.drawable.ic_action_export, true);
rightTitleButtonController = new TitleButtonController() { rightTitleButtonController = new TitleButtonController() {
@Override @Override
@ -73,7 +72,7 @@ public class EditPOIMenuController extends MenuController {
} }
}; };
rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete); rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete);
rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark; rightTitleButtonController.updateStateListDrawableIcon(R.drawable.ic_action_delete_dark, true);
category = getCategory(); category = getCategory();

3
OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionMenuController.java
View file

@ -1,7 +1,6 @@
package net.osmand.plus.parkingpoint; package net.osmand.plus.parkingpoint;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
@ -32,7 +31,7 @@ public class ParkingPositionMenuController extends MenuController {
} }
}; };
leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete); leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete);
leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark; leftTitleButtonController.updateStateListDrawableIcon(R.drawable.ic_action_delete_dark, true);
} }
private void buildParkingDescription(MapActivity mapActivity) { private void buildParkingDescription(MapActivity mapActivity) {