Merge branch 'master' into Fix_my_places_edit_fav

# Conflicts:
#	OsmAnd/res/values-large/sizes.xml
#	OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java

OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl

@@ -93,6 +93,9 @@ import net.osmand.aidlapi.contextmenu.RemoveContextMenuButtonsParams;
 
 import net.osmand.aidlapi.mapmarker.RemoveMapMarkersParams;
 
+import net.osmand.aidlapi.quickaction.QuickActionParams;
+import net.osmand.aidlapi.quickaction.QuickActionInfoParams;
+
 // NOTE: Add new methods at the end of file!!!
 
 interface IOsmAndAidlInterface {
@@ -817,10 +820,10 @@ interface IOsmAndAidlInterface {
      *
      */
     boolean setCustomization(in CustomizationInfoParams params);
-    
+
     /**
      * Method to register for Voice Router voice messages during navigation. Notifies user about voice messages.
-     *    
+     *
      * @params subscribeToUpdates (boolean) - boolean flag to subscribe or unsubscribe from messages
      * @params callbackId (long) - id of callback, needed to unsubscribe from messages
      * @params callback (IOsmAndAidlCallback) - callback to notify user on voice message
@@ -834,4 +837,8 @@ interface IOsmAndAidlInterface {
     boolean removeAllActiveMapMarkers(in RemoveMapMarkersParams params);
 
     boolean importProfile(in ProfileSettingsParams params);
+
+    boolean executeQuickAction(in QuickActionParams params);
+
+    boolean getQuickActionsInfo(out List<QuickActionInfoParams> quickActions);
 }

OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java

@@ -91,6 +91,9 @@ public interface OsmAndCustomizationConstants {
 	String MAP_CONTEXT_MENU_CREATE_POI = MAP_CONTEXT_MENU_ACTIONS + "create_poi";
 	String MAP_CONTEXT_MENU_MODIFY_OSM_NOTE = MAP_CONTEXT_MENU_ACTIONS + "modify_osm_note";
 	String MAP_CONTEXT_MENU_OPEN_OSM_NOTE = MAP_CONTEXT_MENU_ACTIONS + "open_osm_note";
+	String MAP_CONTEXT_MENU_AUDIO_NOTE = MAP_CONTEXT_MENU_ACTIONS + "audio_note";
+	String MAP_CONTEXT_MENU_VIDEO_NOTE = MAP_CONTEXT_MENU_ACTIONS + "video_note";
+	String MAP_CONTEXT_MENU_PHOTO_NOTE = MAP_CONTEXT_MENU_ACTIONS + "photo_note";
 
 	//Plug-in's IDs:
 	String PLUGIN_OSMAND_MONITOR = "osmand.monitoring";

OsmAnd-api/src/net/osmand/aidlapi/quickaction/QuickActionInfoParams.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidlapi.quickaction;
+
+parcelable QuickActionInfoParams;

OsmAnd-api/src/net/osmand/aidlapi/quickaction/QuickActionInfoParams.java

@@ -0,0 +1,69 @@
+package net.osmand.aidlapi.quickaction;
+
+import android.os.Bundle;
+import android.os.Parcel;
+
+import net.osmand.aidlapi.AidlParams;
+
+public class QuickActionInfoParams extends AidlParams {
+
+	private int actionId;
+	private String name;
+	private String actionType;
+	private String params;
+
+	public QuickActionInfoParams(int actionId, String name, String actionType, String params) {
+		this.actionId = actionId;
+		this.name = name;
+		this.actionType = actionType;
+		this.params = params;
+	}
+
+	public QuickActionInfoParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<QuickActionInfoParams> CREATOR = new Creator<QuickActionInfoParams>() {
+		@Override
+		public QuickActionInfoParams createFromParcel(Parcel in) {
+			return new QuickActionInfoParams(in);
+		}
+
+		@Override
+		public QuickActionInfoParams[] newArray(int size) {
+			return new QuickActionInfoParams[size];
+		}
+	};
+
+	public int getActionId() {
+		return actionId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getActionType() {
+		return actionType;
+	}
+
+	public String getParams() {
+		return params;
+	}
+
+	@Override
+	public void writeToBundle(Bundle bundle) {
+		bundle.putInt("actionId", actionId);
+		bundle.putString("name", name);
+		bundle.putString("actionType", actionType);
+		bundle.putString("params", params);
+	}
+
+	@Override
+	protected void readFromBundle(Bundle bundle) {
+		actionId = bundle.getInt("actionNumber");
+		name = bundle.getString("name");
+		actionType = bundle.getString("actionType");
+		params = bundle.getString("params");
+	}
+}

OsmAnd-api/src/net/osmand/aidlapi/quickaction/QuickActionParams.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidlapi.quickaction;
+
+parcelable QuickActionParams;

OsmAnd-api/src/net/osmand/aidlapi/quickaction/QuickActionParams.java

@@ -0,0 +1,45 @@
+package net.osmand.aidlapi.quickaction;
+
+import android.os.Bundle;
+import android.os.Parcel;
+
+import net.osmand.aidlapi.AidlParams;
+
+public class QuickActionParams extends AidlParams {
+
+	private int actionNumber;
+
+	public QuickActionParams(int actionNumber) {
+		this.actionNumber = actionNumber;
+	}
+
+	public QuickActionParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<QuickActionParams> CREATOR = new Creator<QuickActionParams>() {
+		@Override
+		public QuickActionParams createFromParcel(Parcel in) {
+			return new QuickActionParams(in);
+		}
+
+		@Override
+		public QuickActionParams[] newArray(int size) {
+			return new QuickActionParams[size];
+		}
+	};
+
+	public int getActionNumber() {
+		return actionNumber;
+	}
+
+	@Override
+	public void writeToBundle(Bundle bundle) {
+		bundle.putInt("actionNumber", actionNumber);
+	}
+
+	@Override
+	protected void readFromBundle(Bundle bundle) {
+		actionNumber = bundle.getInt("actionNumber");
+	}
+}

OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlInterface.aidl

@@ -73,6 +73,7 @@ import net.osmand.aidl.customization.SetWidgetsParams;
 import net.osmand.aidl.customization.OsmandSettingsParams;
 import net.osmand.aidl.customization.OsmandSettingsInfoParams;
 import net.osmand.aidl.customization.CustomizationInfoParams;
+import net.osmand.aidl.customization.ProfileSettingsParams;
 
 import net.osmand.aidl.gpx.AGpxFile;
 import net.osmand.aidl.gpx.AGpxFileDetails;
@@ -93,6 +94,9 @@ import net.osmand.aidl.contextmenu.RemoveContextMenuButtonsParams;
 
 import net.osmand.aidl.mapmarker.RemoveMapMarkersParams;
 
+import net.osmand.aidl.quickaction.QuickActionParams;
+import net.osmand.aidl.quickaction.QuickActionInfoParams;
+
 // NOTE: Add new methods at the end of file!!!
 
 interface IOsmAndAidlInterface {
@@ -305,6 +309,13 @@ interface IOsmAndAidlInterface {
        */
     boolean addFavoriteGroup(in AddFavoriteGroupParams params);
 
+    	/**
+    	 * Remove favorite group with given name.
+    	 *
+    	 * @param name (String) - name of favorite group.
+    	 */
+    boolean removeFavoriteGroup(in RemoveFavoriteGroupParams params);
+
     	/**
     	 * Update favorite group with given params.
     	 *
@@ -315,13 +326,6 @@ interface IOsmAndAidlInterface {
     	 * @param colorNew (String)  - group color (new).
     	 * @param visibleNew (boolean) - group visibility (new).
     	 */
-    boolean removeFavoriteGroup(in RemoveFavoriteGroupParams params);
-
-    	/**
-    	 * Remove favorite group with given name.
-    	 *
-    	 * @param name (String) - name of favorite group.
-    	 */
     boolean updateFavoriteGroup(in UpdateFavoriteGroupParams params);
 
     	/**
@@ -338,6 +342,16 @@ interface IOsmAndAidlInterface {
     	 */
     boolean addFavorite(in AddFavoriteParams params);
 
+      /**
+       * Remove favorite at given location with given params.
+       *
+       * @param lat (double)  - latitude.
+       * @param lon (double) - longitude.
+       * @param name (String) - name of favorite item.
+       * @param category (String) - category of favorite item.
+       */
+    boolean removeFavorite(in RemoveFavoriteParams params);
+
     	/**
     	 * Update favorite at given location with given params.
     	 *
@@ -356,16 +370,6 @@ interface IOsmAndAidlInterface {
     	 *                       "lightgreen", "green", "lightblue", "blue", "purple", "pink", "brown".
     	 * @param visibleNew (boolean) - should new category be visible after creation.
     	 */
-    boolean removeFavorite(in RemoveFavoriteParams params);
-
-      /**
-       * Remove favorite at given location with given params.
-       *
-       * @param lat (double)  - latitude.
-       * @param lon (double) - longitude.
-       * @param name (String) - name of favorite item.
-       * @param category (String) - category of favorite item.
-       */
     boolean updateFavorite(in UpdateFavoriteParams params);
 
     /**
@@ -846,4 +850,10 @@ interface IOsmAndAidlInterface {
     *
     */
     boolean getGpxColor(inout GpxColorParams params);
+
+    boolean importProfile(in ProfileSettingsParams params);
+
+    boolean executeQuickAction(in QuickActionParams params);
+
+    boolean getQuickActionsInfo(out List<QuickActionInfoParams> quickActions);
 }

OsmAnd-telegram/src/net/osmand/aidl/customization/ProfileSettingsParams.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidl.customization;
+
+parcelable ProfileSettingsParams;

OsmAnd-telegram/src/net/osmand/aidl/customization/ProfileSettingsParams.java

@@ -0,0 +1,64 @@
+package net.osmand.aidl.customization;
+
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class ProfileSettingsParams implements Parcelable {
+
+	private Uri profileSettingsUri;
+	private String latestChanges;
+	private int version;
+
+	public ProfileSettingsParams(Uri profileSettingsUri, String latestChanges, int version) {
+		this.profileSettingsUri = profileSettingsUri;
+		this.latestChanges = latestChanges;
+		this.version = version;
+	}
+
+	public ProfileSettingsParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<ProfileSettingsParams> CREATOR = new Creator<ProfileSettingsParams>() {
+		@Override
+		public ProfileSettingsParams createFromParcel(Parcel in) {
+			return new ProfileSettingsParams(in);
+		}
+
+		@Override
+		public ProfileSettingsParams[] newArray(int size) {
+			return new ProfileSettingsParams[size];
+		}
+	};
+
+	public int getVersion() {
+		return version;
+	}
+
+	public String getLatestChanges() {
+		return latestChanges;
+	}
+
+	public Uri getProfileSettingsUri() {
+		return profileSettingsUri;
+	}
+
+	@Override
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeInt(version);
+		out.writeString(latestChanges);
+		out.writeParcelable(profileSettingsUri, flags);
+	}
+
+	private void readFromParcel(Parcel in) {
+		version = in.readInt();
+		latestChanges = in.readString();
+		profileSettingsUri = in.readParcelable(Uri.class.getClassLoader());
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+}

OsmAnd-telegram/src/net/osmand/aidl/quickaction/QuickActionInfoParams.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidl.quickaction;
+
+parcelable QuickActionInfoParams;

OsmAnd-telegram/src/net/osmand/aidl/quickaction/QuickActionInfoParams.java

@@ -0,0 +1,71 @@
+package net.osmand.aidl.quickaction;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class QuickActionInfoParams implements Parcelable {
+
+	private int actionId;
+	private String name;
+	private String actionType;
+	private String params;
+
+	public QuickActionInfoParams(int actionId, String name, String actionType, String params) {
+		this.actionId = actionId;
+		this.name = name;
+		this.actionType = actionType;
+		this.params = params;
+	}
+
+	public QuickActionInfoParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<QuickActionInfoParams> CREATOR = new Creator<QuickActionInfoParams>() {
+		@Override
+		public QuickActionInfoParams createFromParcel(Parcel in) {
+			return new QuickActionInfoParams(in);
+		}
+
+		@Override
+		public QuickActionInfoParams[] newArray(int size) {
+			return new QuickActionInfoParams[size];
+		}
+	};
+
+	public int getActionId() {
+		return actionId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getActionType() {
+		return actionType;
+	}
+
+	public String getParams() {
+		return params;
+	}
+
+	@Override
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeInt(actionId);
+		out.writeString(name);
+		out.writeString(actionType);
+		out.writeString(params);
+	}
+
+	private void readFromParcel(Parcel in) {
+		actionId = in.readInt();
+		name = in.readString();
+		actionType = in.readString();
+		params = in.readString();
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+}

OsmAnd-telegram/src/net/osmand/aidl/quickaction/QuickActionParams.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidl.quickaction;
+
+parcelable QuickActionParams;

OsmAnd-telegram/src/net/osmand/aidl/quickaction/QuickActionParams.java

@@ -0,0 +1,47 @@
+package net.osmand.aidl.quickaction;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class QuickActionParams implements Parcelable {
+
+	private int actionNumber;
+
+	public QuickActionParams(int actionNumber) {
+		this.actionNumber = actionNumber;
+	}
+
+	public QuickActionParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<QuickActionParams> CREATOR = new Creator<QuickActionParams>() {
+		@Override
+		public QuickActionParams createFromParcel(Parcel in) {
+			return new QuickActionParams(in);
+		}
+
+		@Override
+		public QuickActionParams[] newArray(int size) {
+			return new QuickActionParams[size];
+		}
+	};
+
+	public int getActionNumber() {
+		return actionNumber;
+	}
+
+	@Override
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeInt(actionNumber);
+	}
+
+	private void readFromParcel(Parcel in) {
+		actionNumber = in.readInt();
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+}