Merge remote-tracking branch 'origin/master'

OsmAnd/src/net/osmand/plus/Version.java

@@ -37,7 +37,7 @@ public class Version {
 		return ctx.getString(R.string.versionFeatures).contains("+amazon");
 	}
 	
-	private static boolean isGooglePlayEnabled(OsmandApplication ctx) {
+	public static boolean isGooglePlayEnabled(OsmandApplication ctx) {
 		return ctx.getString(R.string.versionFeatures).contains("+play_market");
 	}
 	

OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java

@@ -40,6 +40,7 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.Version;
 import net.osmand.plus.activities.actions.OsmAndDialogs;
 import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
@@ -691,6 +692,7 @@ public class MapActivityActions implements DialogProvider {
 					}
 				}).reg();
 
+		if (Version.isGooglePlayEnabled(app)) {
 			optionsMenuHelper.item(R.string.osm_live).iconColor(R.drawable.ic_action_osm_live)
 					.listen(new OnContextMenuClick() {
 						@Override
@@ -701,6 +703,7 @@ public class MapActivityActions implements DialogProvider {
 							return false;
 						}
 					}).reg();
+		}
 
 		optionsMenuHelper.item(R.string.prefs_plugins).iconColor(R.drawable.ic_extension_dark)
 				.listen(new OnContextMenuClick() {

OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java

@@ -37,6 +37,7 @@ import net.osmand.map.WorldRegion;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.Version;
 import net.osmand.plus.activities.LocalIndexHelper;
 import net.osmand.plus.activities.LocalIndexInfo;
 import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
@@ -130,9 +131,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppList
 
 		progressBar = (ProgressBar) view.findViewById(R.id.progress);
 
-		//test
+		if (!Version.isDeveloperVersion(getMyApplication())) {
-		//getSettings().LIVE_UPDATES_PURCHASED.set(true);
-
 			subscriptionHeader = inflater.inflate(R.layout.live_updates_header, listView, false);
 			updateSubscriptionHeader();
 
@@ -147,6 +146,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppList
 					}
 				}
 			});
+		}
 
 		loadLocalIndexesTask = new LoadLocalIndexTask(adapter, this).execute();
 		return view;
@@ -232,7 +232,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppList
 	@SuppressWarnings("deprecation")
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		if (getSettings().LIVE_UPDATES_PURCHASED.get()) {
+		if (getSettings().LIVE_UPDATES_PURCHASED.get() && !Version.isDeveloperVersion(getMyApplication())) {
 			ActionBar actionBar = getMyActivity().getSupportActionBar();
 			if (actionBar != null) {
 				actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);

OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java

@@ -11,6 +11,7 @@ import android.view.MenuItem;
 
 import net.osmand.PlatformUtil;
 import net.osmand.plus.R;
+import net.osmand.plus.Version;
 import net.osmand.plus.download.AbstractDownloadActivity;
 import net.osmand.plus.download.DownloadIndexesThread;
 import net.osmand.plus.inapp.InAppHelper;
@@ -34,6 +35,9 @@ public class OsmLiveActivity extends AbstractDownloadActivity
 		setContentView(R.layout.activity_livie_updates);
 
 		inAppHelper = new InAppHelper(getMyApplication());
+		if (Version.isDeveloperVersion(getMyApplication())) {
+			inAppHelper = null;
+		}
 
 		ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
 		pagerAdapter = new LiveUpdatesFragmentPagerAdapter(getSupportFragmentManager());

OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java

@@ -52,8 +52,10 @@ public class MapMarkersWidgetsFactory {
 	private ImageButton moreButton;
 	private ImageButton moreButton2nd;
 
+	private MapMarker marker;
 	private int markerColorIndex = -1;
 	private String markerDistText;
+	private MapMarker marker2nd;
 	private int markerColorIndex2nd = -1;
 	private String markerDistText2nd;
 
@@ -249,13 +251,17 @@ public class MapMarkersWidgetsFactory {
 		arrowImg.invalidate();
 
 		int dist = (int) mes[0];
-		String txt;
+		String txt = null;
 		if (loc != null) {
 			txt = OsmAndFormatter.getFormattedDistance(dist, map.getMyApplication());
 		} else {
+			if ((firstLine && marker != this.marker) || (!firstLine && marker != this.marker2nd)) {
 				txt = "—";
 			}
+		}
+		if (txt != null) {
 			distText.setText(txt);
+		}
 		updateVisibility(okButton, !customLocation && loc != null && dist < MIN_DIST_OK_VISIBLE);
 
 		String descr;
@@ -272,12 +278,18 @@ public class MapMarkersWidgetsFactory {
 		addressText.setText(descr);
 
 		if (firstLine) {
+			this.marker = marker;
 			markerColorIndex = marker.colorIndex;
+			if (txt != null) {
 				markerDistText = txt;
+			}
 		} else {
+			this.marker2nd = marker;
 			markerColorIndex2nd = marker.colorIndex;
+			if (txt != null) {
 				markerDistText2nd = txt;
 			}
+		}
 
 	}
 
@@ -294,6 +306,7 @@ public class MapMarkersWidgetsFactory {
 						setImageDrawable(map.getMyApplication().getIconsCache()
 								.getIcon(R.drawable.widget_marker_day,
 										MapMarkerDialogHelper.getMapMarkerColorId(markerColorIndex)));
+						cachedMarkerColorIndex = markerColorIndex;
 						res = true;
 					}
 					if (!markerDistText.equals(cachedMarkerDistText)) {
@@ -303,11 +316,13 @@ public class MapMarkersWidgetsFactory {
 						} else {
 							setText(markerDistText.substring(0, ls), markerDistText.substring(ls + 1));
 						}
+						cachedMarkerDistText = markerDistText;
 						res = true;
 					}
 					return res;
 
 				} else if (cachedMarkerDistText != null) {
+					cachedMarkerColorIndex = -1;
 					cachedMarkerDistText = null;
 					setText(null, null);
 					return true;
@@ -338,6 +353,7 @@ public class MapMarkersWidgetsFactory {
 						setImageDrawable(map.getMyApplication().getIconsCache()
 								.getIcon(R.drawable.widget_marker_day,
 										MapMarkerDialogHelper.getMapMarkerColorId(markerColorIndex2nd)));
+						cachedMarkerColorIndex = markerColorIndex2nd;
 						res = true;
 					}
 					if (!markerDistText2nd.equals(cachedMarkerDistText)) {
@@ -347,11 +363,13 @@ public class MapMarkersWidgetsFactory {
 						} else {
 							setText(markerDistText2nd.substring(0, ls), markerDistText2nd.substring(ls + 1));
 						}
+						cachedMarkerDistText = markerDistText2nd;
 						res = true;
 					}
 					return res;
 
 				} else if (cachedMarkerDistText != null) {
+					cachedMarkerColorIndex = -1;
 					cachedMarkerDistText = null;
 					setText(null, null);
 					return true;