diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt index ed6e449d4b..1ea767f072 100644 --- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt +++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt @@ -7,44 +7,44 @@ import android.content.ServiceConnection import android.net.Uri import android.os.IBinder import android.os.RemoteException -import net.osmand.aidl2.IOsmAndAidlCallback -import net.osmand.aidl2.IOsmAndAidlInterface -import net.osmand.aidl2.contextmenu.AContextMenuButton -import net.osmand.aidl2.contextmenu.ContextMenuButtonsParams -import net.osmand.aidl2.contextmenu.RemoveContextMenuButtonsParams -import net.osmand.aidl2.favorite.AFavorite -import net.osmand.aidl2.favorite.AddFavoriteParams -import net.osmand.aidl2.favorite.RemoveFavoriteParams -import net.osmand.aidl2.favorite.UpdateFavoriteParams -import net.osmand.aidl2.favorite.group.AFavoriteGroup -import net.osmand.aidl2.favorite.group.AddFavoriteGroupParams -import net.osmand.aidl2.favorite.group.RemoveFavoriteGroupParams -import net.osmand.aidl2.favorite.group.UpdateFavoriteGroupParams -import net.osmand.aidl2.gpx.* -import net.osmand.aidl2.map.ALatLon -import net.osmand.aidl2.map.SetMapLocationParams -import net.osmand.aidl2.maplayer.AMapLayer -import net.osmand.aidl2.maplayer.AddMapLayerParams -import net.osmand.aidl2.maplayer.RemoveMapLayerParams -import net.osmand.aidl2.maplayer.UpdateMapLayerParams -import net.osmand.aidl2.maplayer.point.* -import net.osmand.aidl2.mapmarker.AMapMarker -import net.osmand.aidl2.mapmarker.AddMapMarkerParams -import net.osmand.aidl2.mapmarker.RemoveMapMarkerParams -import net.osmand.aidl2.mapmarker.UpdateMapMarkerParams -import net.osmand.aidl2.mapwidget.AMapWidget -import net.osmand.aidl2.mapwidget.AddMapWidgetParams -import net.osmand.aidl2.mapwidget.RemoveMapWidgetParams -import net.osmand.aidl2.mapwidget.UpdateMapWidgetParams -import net.osmand.aidl2.navdrawer.NavDrawerItem -import net.osmand.aidl2.navdrawer.SetNavDrawerItemsParams -import net.osmand.aidl2.navigation.* -import net.osmand.aidl2.note.StartAudioRecordingParams -import net.osmand.aidl2.note.StartVideoRecordingParams -import net.osmand.aidl2.note.StopRecordingParams -import net.osmand.aidl2.note.TakePhotoNoteParams -import net.osmand.aidl2.search.SearchParams -import net.osmand.aidl2.search.SearchResult +import net.osmand.aidlapi.IOsmAndAidlCallback +import net.osmand.aidlapi.IOsmAndAidlInterface +import net.osmand.aidlapi.contextmenu.AContextMenuButton +import net.osmand.aidlapi.contextmenu.ContextMenuButtonsParams +import net.osmand.aidlapi.contextmenu.RemoveContextMenuButtonsParams +import net.osmand.aidlapi.favorite.AFavorite +import net.osmand.aidlapi.favorite.AddFavoriteParams +import net.osmand.aidlapi.favorite.RemoveFavoriteParams +import net.osmand.aidlapi.favorite.UpdateFavoriteParams +import net.osmand.aidlapi.favorite.group.AFavoriteGroup +import net.osmand.aidlapi.favorite.group.AddFavoriteGroupParams +import net.osmand.aidlapi.favorite.group.RemoveFavoriteGroupParams +import net.osmand.aidlapi.favorite.group.UpdateFavoriteGroupParams +import net.osmand.aidlapi.gpx.* +import net.osmand.aidlapi.map.ALatLon +import net.osmand.aidlapi.map.SetMapLocationParams +import net.osmand.aidlapi.maplayer.AMapLayer +import net.osmand.aidlapi.maplayer.AddMapLayerParams +import net.osmand.aidlapi.maplayer.RemoveMapLayerParams +import net.osmand.aidlapi.maplayer.UpdateMapLayerParams +import net.osmand.aidlapi.maplayer.point.* +import net.osmand.aidlapi.mapmarker.AMapMarker +import net.osmand.aidlapi.mapmarker.AddMapMarkerParams +import net.osmand.aidlapi.mapmarker.RemoveMapMarkerParams +import net.osmand.aidlapi.mapmarker.UpdateMapMarkerParams +import net.osmand.aidlapi.mapwidget.AMapWidget +import net.osmand.aidlapi.mapwidget.AddMapWidgetParams +import net.osmand.aidlapi.mapwidget.RemoveMapWidgetParams +import net.osmand.aidlapi.mapwidget.UpdateMapWidgetParams +import net.osmand.aidlapi.navdrawer.NavDrawerItem +import net.osmand.aidlapi.navdrawer.SetNavDrawerItemsParams +import net.osmand.aidlapi.navigation.* +import net.osmand.aidlapi.note.StartAudioRecordingParams +import net.osmand.aidlapi.note.StartVideoRecordingParams +import net.osmand.aidlapi.note.StopRecordingParams +import net.osmand.aidlapi.note.TakePhotoNoteParams +import net.osmand.aidlapi.search.SearchParams +import net.osmand.aidlapi.search.SearchResult import net.osmand.telegram.TelegramApplication import net.osmand.telegram.helpers.ShowLocationHelper.Companion.MAP_LAYER_ID import java.io.File diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt index 796e98310e..1b1d8f936b 100644 --- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt +++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt @@ -6,10 +6,10 @@ import android.os.AsyncTask import android.text.TextUtils import net.osmand.GPXUtilities import net.osmand.PlatformUtil -import net.osmand.aidl2.gpx.AGpxFile -import net.osmand.aidl2.map.ALatLon -import net.osmand.aidl2.maplayer.point.AMapPoint -import net.osmand.aidl2.mapmarker.AMapMarker +import net.osmand.aidlapi.gpx.AGpxFile +import net.osmand.aidlapi.map.ALatLon +import net.osmand.aidlapi.maplayer.point.AMapPoint +import net.osmand.aidlapi.mapmarker.AMapMarker import net.osmand.telegram.R import net.osmand.telegram.TelegramApplication import net.osmand.telegram.helpers.OsmandAidlHelper.ContextMenuButtonsListener diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt index d048da85ad..355c4916a1 100644 --- a/OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt +++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt @@ -24,7 +24,7 @@ import android.widget.TextView import android.widget.Toast import net.osmand.GPXUtilities import net.osmand.PlatformUtil -import net.osmand.aidl2.gpx.AGpxBitmap +import net.osmand.aidlapi.gpx.AGpxBitmap import net.osmand.telegram.R import net.osmand.telegram.TelegramApplication import net.osmand.telegram.TelegramSettings diff --git a/OsmAnd/src/net/osmand/aidl/AidlCallbackListenerV2.java b/OsmAnd/src/net/osmand/aidl/AidlCallbackListenerV2.java index 2f8bcea2d3..a1579da12d 100644 --- a/OsmAnd/src/net/osmand/aidl/AidlCallbackListenerV2.java +++ b/OsmAnd/src/net/osmand/aidl/AidlCallbackListenerV2.java @@ -1,6 +1,6 @@ package net.osmand.aidl; -import net.osmand.aidl2.IOsmAndAidlCallback; +import net.osmand.aidlapi.IOsmAndAidlCallback; import java.util.Map; diff --git a/OsmAnd/src/net/osmand/aidl/AidlContextMenuButtonWrapper.java b/OsmAnd/src/net/osmand/aidl/AidlContextMenuButtonWrapper.java index 68d72bde77..28c27acb26 100644 --- a/OsmAnd/src/net/osmand/aidl/AidlContextMenuButtonWrapper.java +++ b/OsmAnd/src/net/osmand/aidl/AidlContextMenuButtonWrapper.java @@ -24,7 +24,7 @@ public class AidlContextMenuButtonWrapper { enabled = aContextMenuButton.isEnabled(); } - public AidlContextMenuButtonWrapper(net.osmand.aidl2.contextmenu.AContextMenuButton aContextMenuButton) { + public AidlContextMenuButtonWrapper(net.osmand.aidlapi.contextmenu.AContextMenuButton aContextMenuButton) { buttonId = aContextMenuButton.getButtonId(); leftTextCaption = aContextMenuButton.getLeftTextCaption(); rightTextCaption = aContextMenuButton.getRightTextCaption(); diff --git a/OsmAnd/src/net/osmand/aidl/AidlContextMenuButtonsWrapper.java b/OsmAnd/src/net/osmand/aidl/AidlContextMenuButtonsWrapper.java index 3b0fe022e9..32fbcb8796 100644 --- a/OsmAnd/src/net/osmand/aidl/AidlContextMenuButtonsWrapper.java +++ b/OsmAnd/src/net/osmand/aidl/AidlContextMenuButtonsWrapper.java @@ -35,15 +35,15 @@ public class AidlContextMenuButtonsWrapper { } } - public AidlContextMenuButtonsWrapper(net.osmand.aidl2.contextmenu.ContextMenuButtonsParams params) { + public AidlContextMenuButtonsWrapper(net.osmand.aidlapi.contextmenu.ContextMenuButtonsParams params) { id = params.getId(); appPackage = params.getAppPackage(); layerId = params.getLayerId(); callbackId = params.getCallbackId(); pointsIds = params.getPointsIds(); - net.osmand.aidl2.contextmenu.AContextMenuButton leftButton = params.getLeftButton(); - net.osmand.aidl2.contextmenu.AContextMenuButton rightButton = params.getRightButton(); + net.osmand.aidlapi.contextmenu.AContextMenuButton leftButton = params.getLeftButton(); + net.osmand.aidlapi.contextmenu.AContextMenuButton rightButton = params.getRightButton(); if (leftButton != null) { this.leftButton = new AidlContextMenuButtonWrapper(leftButton); } diff --git a/OsmAnd/src/net/osmand/aidl/AidlMapLayerWrapper.java b/OsmAnd/src/net/osmand/aidl/AidlMapLayerWrapper.java index 24d50b1d17..3737736bd8 100644 --- a/OsmAnd/src/net/osmand/aidl/AidlMapLayerWrapper.java +++ b/OsmAnd/src/net/osmand/aidl/AidlMapLayerWrapper.java @@ -43,7 +43,7 @@ public class AidlMapLayerWrapper { } } - public AidlMapLayerWrapper(net.osmand.aidl2.maplayer.AMapLayer aMapLayer) { + public AidlMapLayerWrapper(net.osmand.aidlapi.maplayer.AMapLayer aMapLayer) { id = aMapLayer.getId(); name = aMapLayer.getName(); zOrder = aMapLayer.getZOrder(); @@ -55,9 +55,9 @@ public class AidlMapLayerWrapper { bigPointMinZoom = aMapLayer.getBigPointMinZoom(); bigPointMaxZoom = aMapLayer.getBigPointMaxZoom(); - List pointList = aMapLayer.getPoints(); + List pointList = aMapLayer.getPoints(); if (pointList != null) { - for (net.osmand.aidl2.maplayer.point.AMapPoint p : pointList) { + for (net.osmand.aidlapi.maplayer.point.AMapPoint p : pointList) { this.points.put(p.getId(), new AidlMapPointWrapper(p)); } } diff --git a/OsmAnd/src/net/osmand/aidl/AidlMapPointWrapper.java b/OsmAnd/src/net/osmand/aidl/AidlMapPointWrapper.java index b58dc1d8c8..fdaeb0a082 100644 --- a/OsmAnd/src/net/osmand/aidl/AidlMapPointWrapper.java +++ b/OsmAnd/src/net/osmand/aidl/AidlMapPointWrapper.java @@ -33,7 +33,7 @@ public class AidlMapPointWrapper { params = aMapPoint.getParams(); } - public AidlMapPointWrapper(net.osmand.aidl2.maplayer.point.AMapPoint aMapPoint) { + public AidlMapPointWrapper(net.osmand.aidlapi.maplayer.point.AMapPoint aMapPoint) { id = aMapPoint.getId(); shortName = aMapPoint.getShortName(); fullName = aMapPoint.getFullName(); @@ -41,7 +41,7 @@ public class AidlMapPointWrapper { layerId = aMapPoint.getLayerId(); color = aMapPoint.getColor(); - net.osmand.aidl2.map.ALatLon aLatLon = aMapPoint.getLocation(); + net.osmand.aidlapi.map.ALatLon aLatLon = aMapPoint.getLocation(); location = new LatLon(aLatLon.getLatitude(), aLatLon.getLongitude()); details = aMapPoint.getDetails(); params = aMapPoint.getParams(); diff --git a/OsmAnd/src/net/osmand/aidl/AidlMapWidgetWrapper.java b/OsmAnd/src/net/osmand/aidl/AidlMapWidgetWrapper.java index e7f91853e5..b60d2a4416 100644 --- a/OsmAnd/src/net/osmand/aidl/AidlMapWidgetWrapper.java +++ b/OsmAnd/src/net/osmand/aidl/AidlMapWidgetWrapper.java @@ -28,7 +28,7 @@ public class AidlMapWidgetWrapper { this.intentOnClick = aMapWidget.getIntentOnClick(); } - public AidlMapWidgetWrapper(net.osmand.aidl2.mapwidget.AMapWidget aMapWidget) { + public AidlMapWidgetWrapper(net.osmand.aidlapi.mapwidget.AMapWidget aMapWidget) { this.id = aMapWidget.getId(); this.menuIconName = aMapWidget.getMenuIconName(); this.menuTitle = aMapWidget.getMenuTitle(); diff --git a/osmand-api/src/net/osmand/aidl/IOsmAndAidlCallback.aidl b/OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/IOsmAndAidlCallback.aidl rename to OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl diff --git a/osmand-api/src/net/osmand/aidl/IOsmAndAidlInterface.aidl b/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/IOsmAndAidlInterface.aidl rename to OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java index 8c96796c36..469c1ec6bf 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java @@ -101,14 +101,14 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; -import static net.osmand.OsmandAidlConstants.COPY_FILE_IO_ERROR; -import static net.osmand.OsmandAidlConstants.COPY_FILE_MAX_LOCK_TIME_MS; -import static net.osmand.OsmandAidlConstants.COPY_FILE_PARAMS_ERROR; -import static net.osmand.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT; -import static net.osmand.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT_ERROR; -import static net.osmand.OsmandAidlConstants.COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR; -import static net.osmand.OsmandAidlConstants.COPY_FILE_WRITE_LOCK_ERROR; -import static net.osmand.OsmandAidlConstants.OK_RESPONSE; +import static net.osmand.aidlapi.OsmandAidlConstants.COPY_FILE_IO_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.COPY_FILE_MAX_LOCK_TIME_MS; +import static net.osmand.aidlapi.OsmandAidlConstants.COPY_FILE_PARAMS_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT; +import static net.osmand.aidlapi.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.COPY_FILE_WRITE_LOCK_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.OK_RESPONSE; import static net.osmand.aidl.OsmandAidlService.KEY_ON_CONTEXT_MENU_BUTTONS_CLICK; import static net.osmand.aidl.OsmandAidlService.KEY_ON_NAV_DATA_UPDATE; import static net.osmand.aidl.OsmandAidlService.KEY_ON_VOICE_MESSAGE; @@ -1414,7 +1414,7 @@ public class OsmandAidlApi { return true; } - boolean getActiveGpxV2(List files) { + boolean getActiveGpxV2(List files) { List selectedGpxFiles = app.getSelectedGpxHelper().getSelectedGPXFiles(); String gpxPath = app.getAppPath(IndexConstants.GPX_INDEX_DIR).getAbsolutePath(); for (SelectedGpxFile selectedGpxFile : selectedGpxFiles) { @@ -1426,13 +1426,13 @@ public class OsmandAidlApi { } long modifiedTime = gpxFile.modifiedTime; long fileSize = new File(gpxFile.path).length(); - files.add(new net.osmand.aidl2.gpx.ASelectedGpxFile(path, modifiedTime, fileSize, createGpxFileDetailsV2(selectedGpxFile.getTrackAnalysis()))); + files.add(new net.osmand.aidlapi.gpx.ASelectedGpxFile(path, modifiedTime, fileSize, createGpxFileDetailsV2(selectedGpxFile.getTrackAnalysis()))); } } return true; } - boolean getImportedGpxV2(List files) { + boolean getImportedGpxV2(List files) { List gpxDataItems = app.getGpxDatabase().getItems(); for (GpxDataItem dataItem : gpxDataItems) { File file = dataItem.getFile(); @@ -1441,12 +1441,12 @@ public class OsmandAidlApi { boolean active = app.getSelectedGpxHelper().getSelectedFileByPath(file.getAbsolutePath()) != null; long modifiedTime = dataItem.getFileLastModifiedTime(); long fileSize = file.length(); - net.osmand.aidl2.gpx.AGpxFileDetails details = null; + net.osmand.aidlapi.gpx.AGpxFileDetails details = null; GPXTrackAnalysis analysis = dataItem.getAnalysis(); if (analysis != null) { details = createGpxFileDetailsV2(analysis); } - files.add(new net.osmand.aidl2.gpx.AGpxFile(fileName, modifiedTime, fileSize, active, details)); + files.add(new net.osmand.aidlapi.gpx.AGpxFile(fileName, modifiedTime, fileSize, active, details)); } } return true; @@ -1524,7 +1524,7 @@ public class OsmandAidlApi { return true; } - private boolean getSqliteDbFilesV2(List fileNames, boolean activeOnly) { + private boolean getSqliteDbFilesV2(List fileNames, boolean activeOnly) { File tilesPath = app.getAppPath(IndexConstants.TILES_INDEX_DIR); if (tilesPath.canRead()) { File[] files = tilesPath.listFiles(); @@ -1536,7 +1536,7 @@ public class OsmandAidlApi { if (tileFile.isFile() && !fileNameLC.startsWith("hillshade") && fileNameLC.endsWith(SQLiteTileSource.EXT)) { boolean active = fileName.equals(activeFile); if (!activeOnly || active) { - fileNames.add(new net.osmand.aidl2.tiles.ASqliteDbFile(fileName, tileFile.lastModified(), tileFile.length(), active)); + fileNames.add(new net.osmand.aidlapi.tiles.ASqliteDbFile(fileName, tileFile.lastModified(), tileFile.length(), active)); } } } @@ -1553,11 +1553,11 @@ public class OsmandAidlApi { return getSqliteDbFiles(fileNames, true); } - boolean getSqliteDbFilesV2(List fileNames) { + boolean getSqliteDbFilesV2(List fileNames) { return getSqliteDbFilesV2(fileNames, false); } - boolean getActiveSqliteDbFilesV2(List fileNames) { + boolean getActiveSqliteDbFilesV2(List fileNames) { return getSqliteDbFilesV2(fileNames, true); } @@ -1972,7 +1972,7 @@ public class OsmandAidlApi { } } if (aidlCallbackListenerV2 != null) { - net.osmand.aidl2.navigation.ADirectionInfo directionInfo = new net.osmand.aidl2.navigation.ADirectionInfo(-1, -1, false); + net.osmand.aidlapi.navigation.ADirectionInfo directionInfo = new net.osmand.aidlapi.navigation.ADirectionInfo(-1, -1, false); RoutingHelper rh = app.getRoutingHelper(); if (rh.isDeviatedFromRoute()) { directionInfo.setTurnType(TurnType.OFFR); @@ -2024,7 +2024,7 @@ public class OsmandAidlApi { for (OsmandAidlServiceV2.AidlCallbackParams cb : aidlCallbackListenerV2.getAidlCallbacks().values()) { if (!aidlCallbackListenerV2.getAidlCallbacks().isEmpty() && (cb.getKey() & KEY_ON_VOICE_MESSAGE) > 0) { try { - cb.getCallback().onVoiceRouterNotify(new net.osmand.aidl2.navigation.OnVoiceNavigationParams(cmds, played)); + cb.getCallback().onVoiceRouterNotify(new net.osmand.aidlapi.navigation.OnVoiceNavigationParams(cmds, played)); } catch (Exception e) { LOG.error(e.getMessage(), e); } @@ -2326,8 +2326,8 @@ public class OsmandAidlApi { a.points, a.wptPoints, a.wptCategoryNames); } - private static net.osmand.aidl2.gpx.AGpxFileDetails createGpxFileDetailsV2(@NonNull GPXTrackAnalysis a) { - return new net.osmand.aidl2.gpx.AGpxFileDetails(a.totalDistance, a.totalTracks, a.startTime, a.endTime, + private static net.osmand.aidlapi.gpx.AGpxFileDetails createGpxFileDetailsV2(@NonNull GPXTrackAnalysis a) { + return new net.osmand.aidlapi.gpx.AGpxFileDetails(a.totalDistance, a.totalTracks, a.startTime, a.endTime, a.timeSpan, a.timeMoving, a.totalDistanceMoving, a.diffElevationUp, a.diffElevationDown, a.avgElevation, a.minElevation, a.maxElevation, a.minSpeed, a.maxSpeed, a.avgSpeed, a.points, a.wptPoints, a.wptCategoryNames); diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java index 0b7409b321..a0533c6e5d 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java @@ -94,10 +94,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import static net.osmand.OsmandAidlConstants.CANNOT_ACCESS_API_ERROR; -import static net.osmand.OsmandAidlConstants.MIN_UPDATE_TIME_MS; -import static net.osmand.OsmandAidlConstants.MIN_UPDATE_TIME_MS_ERROR; -import static net.osmand.OsmandAidlConstants.UNKNOWN_API_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.CANNOT_ACCESS_API_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.MIN_UPDATE_TIME_MS; +import static net.osmand.aidlapi.OsmandAidlConstants.MIN_UPDATE_TIME_MS_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.UNKNOWN_API_ERROR; public class OsmandAidlService extends Service implements AidlCallbackListener { diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java index fc6b5b3d45..ad153d58ff 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java @@ -14,75 +14,75 @@ import net.osmand.PlatformUtil; import net.osmand.aidl.OsmandAidlApi.GpxBitmapCreatedCallback; import net.osmand.aidl.OsmandAidlApi.OsmandAppInitCallback; import net.osmand.aidl.OsmandAidlApi.SearchCompleteCallback; -import net.osmand.aidl2.IOsmAndAidlCallback; -import net.osmand.aidl2.IOsmAndAidlInterface; -import net.osmand.aidl2.calculateroute.CalculateRouteParams; -import net.osmand.aidl2.contextmenu.ContextMenuButtonsParams; -import net.osmand.aidl2.contextmenu.RemoveContextMenuButtonsParams; -import net.osmand.aidl2.contextmenu.UpdateContextMenuButtonsParams; -import net.osmand.aidl2.copyfile.CopyFileParams; -import net.osmand.aidl2.customization.CustomizationInfoParams; -import net.osmand.aidl2.customization.OsmandSettingsInfoParams; -import net.osmand.aidl2.customization.OsmandSettingsParams; -import net.osmand.aidl2.customization.SetWidgetsParams; -import net.osmand.aidl2.favorite.AFavorite; -import net.osmand.aidl2.favorite.AddFavoriteParams; -import net.osmand.aidl2.favorite.RemoveFavoriteParams; -import net.osmand.aidl2.favorite.UpdateFavoriteParams; -import net.osmand.aidl2.favorite.group.AFavoriteGroup; -import net.osmand.aidl2.favorite.group.AddFavoriteGroupParams; -import net.osmand.aidl2.favorite.group.RemoveFavoriteGroupParams; -import net.osmand.aidl2.favorite.group.UpdateFavoriteGroupParams; -import net.osmand.aidl2.gpx.AGpxBitmap; -import net.osmand.aidl2.gpx.AGpxFile; -import net.osmand.aidl2.gpx.ASelectedGpxFile; -import net.osmand.aidl2.gpx.CreateGpxBitmapParams; -import net.osmand.aidl2.gpx.GpxColorParams; -import net.osmand.aidl2.gpx.HideGpxParams; -import net.osmand.aidl2.gpx.ImportGpxParams; -import net.osmand.aidl2.gpx.RemoveGpxParams; -import net.osmand.aidl2.gpx.ShowGpxParams; -import net.osmand.aidl2.gpx.StartGpxRecordingParams; -import net.osmand.aidl2.gpx.StopGpxRecordingParams; -import net.osmand.aidl2.map.ALatLon; -import net.osmand.aidl2.map.SetMapLocationParams; -import net.osmand.aidl2.maplayer.AddMapLayerParams; -import net.osmand.aidl2.maplayer.RemoveMapLayerParams; -import net.osmand.aidl2.maplayer.UpdateMapLayerParams; -import net.osmand.aidl2.maplayer.point.AddMapPointParams; -import net.osmand.aidl2.maplayer.point.RemoveMapPointParams; -import net.osmand.aidl2.maplayer.point.ShowMapPointParams; -import net.osmand.aidl2.maplayer.point.UpdateMapPointParams; -import net.osmand.aidl2.mapmarker.AMapMarker; -import net.osmand.aidl2.mapmarker.AddMapMarkerParams; -import net.osmand.aidl2.mapmarker.RemoveMapMarkerParams; -import net.osmand.aidl2.mapmarker.RemoveMapMarkersParams; -import net.osmand.aidl2.mapmarker.UpdateMapMarkerParams; -import net.osmand.aidl2.mapwidget.AddMapWidgetParams; -import net.osmand.aidl2.mapwidget.RemoveMapWidgetParams; -import net.osmand.aidl2.mapwidget.UpdateMapWidgetParams; -import net.osmand.aidl2.navdrawer.NavDrawerFooterParams; -import net.osmand.aidl2.navdrawer.NavDrawerHeaderParams; -import net.osmand.aidl2.navdrawer.NavDrawerItem; -import net.osmand.aidl2.navdrawer.SetNavDrawerItemsParams; -import net.osmand.aidl2.navigation.ANavigationUpdateParams; -import net.osmand.aidl2.navigation.ANavigationVoiceRouterMessageParams; -import net.osmand.aidl2.navigation.MuteNavigationParams; -import net.osmand.aidl2.navigation.NavigateGpxParams; -import net.osmand.aidl2.navigation.NavigateParams; -import net.osmand.aidl2.navigation.NavigateSearchParams; -import net.osmand.aidl2.navigation.PauseNavigationParams; -import net.osmand.aidl2.navigation.ResumeNavigationParams; -import net.osmand.aidl2.navigation.StopNavigationParams; -import net.osmand.aidl2.navigation.UnmuteNavigationParams; -import net.osmand.aidl2.note.StartAudioRecordingParams; -import net.osmand.aidl2.note.StartVideoRecordingParams; -import net.osmand.aidl2.note.StopRecordingParams; -import net.osmand.aidl2.note.TakePhotoNoteParams; -import net.osmand.aidl2.plugins.PluginParams; -import net.osmand.aidl2.search.SearchParams; -import net.osmand.aidl2.search.SearchResult; -import net.osmand.aidl2.tiles.ASqliteDbFile; +import net.osmand.aidlapi.IOsmAndAidlCallback; +import net.osmand.aidlapi.IOsmAndAidlInterface; +import net.osmand.aidlapi.calculateroute.CalculateRouteParams; +import net.osmand.aidlapi.contextmenu.ContextMenuButtonsParams; +import net.osmand.aidlapi.contextmenu.RemoveContextMenuButtonsParams; +import net.osmand.aidlapi.contextmenu.UpdateContextMenuButtonsParams; +import net.osmand.aidlapi.copyfile.CopyFileParams; +import net.osmand.aidlapi.customization.CustomizationInfoParams; +import net.osmand.aidlapi.customization.OsmandSettingsInfoParams; +import net.osmand.aidlapi.customization.OsmandSettingsParams; +import net.osmand.aidlapi.customization.SetWidgetsParams; +import net.osmand.aidlapi.favorite.AFavorite; +import net.osmand.aidlapi.favorite.AddFavoriteParams; +import net.osmand.aidlapi.favorite.RemoveFavoriteParams; +import net.osmand.aidlapi.favorite.UpdateFavoriteParams; +import net.osmand.aidlapi.favorite.group.AFavoriteGroup; +import net.osmand.aidlapi.favorite.group.AddFavoriteGroupParams; +import net.osmand.aidlapi.favorite.group.RemoveFavoriteGroupParams; +import net.osmand.aidlapi.favorite.group.UpdateFavoriteGroupParams; +import net.osmand.aidlapi.gpx.AGpxBitmap; +import net.osmand.aidlapi.gpx.AGpxFile; +import net.osmand.aidlapi.gpx.ASelectedGpxFile; +import net.osmand.aidlapi.gpx.CreateGpxBitmapParams; +import net.osmand.aidlapi.gpx.GpxColorParams; +import net.osmand.aidlapi.gpx.HideGpxParams; +import net.osmand.aidlapi.gpx.ImportGpxParams; +import net.osmand.aidlapi.gpx.RemoveGpxParams; +import net.osmand.aidlapi.gpx.ShowGpxParams; +import net.osmand.aidlapi.gpx.StartGpxRecordingParams; +import net.osmand.aidlapi.gpx.StopGpxRecordingParams; +import net.osmand.aidlapi.map.ALatLon; +import net.osmand.aidlapi.map.SetMapLocationParams; +import net.osmand.aidlapi.maplayer.AddMapLayerParams; +import net.osmand.aidlapi.maplayer.RemoveMapLayerParams; +import net.osmand.aidlapi.maplayer.UpdateMapLayerParams; +import net.osmand.aidlapi.maplayer.point.AddMapPointParams; +import net.osmand.aidlapi.maplayer.point.RemoveMapPointParams; +import net.osmand.aidlapi.maplayer.point.ShowMapPointParams; +import net.osmand.aidlapi.maplayer.point.UpdateMapPointParams; +import net.osmand.aidlapi.mapmarker.AMapMarker; +import net.osmand.aidlapi.mapmarker.AddMapMarkerParams; +import net.osmand.aidlapi.mapmarker.RemoveMapMarkerParams; +import net.osmand.aidlapi.mapmarker.RemoveMapMarkersParams; +import net.osmand.aidlapi.mapmarker.UpdateMapMarkerParams; +import net.osmand.aidlapi.mapwidget.AddMapWidgetParams; +import net.osmand.aidlapi.mapwidget.RemoveMapWidgetParams; +import net.osmand.aidlapi.mapwidget.UpdateMapWidgetParams; +import net.osmand.aidlapi.navdrawer.NavDrawerFooterParams; +import net.osmand.aidlapi.navdrawer.NavDrawerHeaderParams; +import net.osmand.aidlapi.navdrawer.NavDrawerItem; +import net.osmand.aidlapi.navdrawer.SetNavDrawerItemsParams; +import net.osmand.aidlapi.navigation.ANavigationUpdateParams; +import net.osmand.aidlapi.navigation.ANavigationVoiceRouterMessageParams; +import net.osmand.aidlapi.navigation.MuteNavigationParams; +import net.osmand.aidlapi.navigation.NavigateGpxParams; +import net.osmand.aidlapi.navigation.NavigateParams; +import net.osmand.aidlapi.navigation.NavigateSearchParams; +import net.osmand.aidlapi.navigation.PauseNavigationParams; +import net.osmand.aidlapi.navigation.ResumeNavigationParams; +import net.osmand.aidlapi.navigation.StopNavigationParams; +import net.osmand.aidlapi.navigation.UnmuteNavigationParams; +import net.osmand.aidlapi.note.StartAudioRecordingParams; +import net.osmand.aidlapi.note.StartVideoRecordingParams; +import net.osmand.aidlapi.note.StopRecordingParams; +import net.osmand.aidlapi.note.TakePhotoNoteParams; +import net.osmand.aidlapi.plugins.PluginParams; +import net.osmand.aidlapi.search.SearchParams; +import net.osmand.aidlapi.search.SearchResult; +import net.osmand.aidlapi.tiles.ASqliteDbFile; import net.osmand.data.LatLon; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmandApplication; @@ -96,10 +96,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import static net.osmand.OsmandAidlConstants.CANNOT_ACCESS_API_ERROR; -import static net.osmand.OsmandAidlConstants.MIN_UPDATE_TIME_MS; -import static net.osmand.OsmandAidlConstants.MIN_UPDATE_TIME_MS_ERROR; -import static net.osmand.OsmandAidlConstants.UNKNOWN_API_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.CANNOT_ACCESS_API_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.MIN_UPDATE_TIME_MS; +import static net.osmand.aidlapi.OsmandAidlConstants.MIN_UPDATE_TIME_MS_ERROR; +import static net.osmand.aidlapi.OsmandAidlConstants.UNKNOWN_API_ERROR; public class OsmandAidlServiceV2 extends Service implements AidlCallbackListenerV2 { diff --git a/osmand-api/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl b/OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl rename to OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java b/OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java rename to OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java diff --git a/osmand-api/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl b/OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl rename to OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl diff --git a/osmand-api/src/net/osmand/aidl/contextmenu/AContextMenuButton.java b/OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/contextmenu/AContextMenuButton.java rename to OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.java diff --git a/osmand-api/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl b/OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl rename to OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java b/OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java rename to OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java diff --git a/osmand-api/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl b/OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl rename to OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java b/OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java rename to OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java diff --git a/osmand-api/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl b/OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl rename to OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java b/OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java rename to OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java diff --git a/osmand-api/src/net/osmand/aidl/copyfile/CopyFileParams.aidl b/OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/copyfile/CopyFileParams.aidl rename to OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/copyfile/CopyFileParams.java b/OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/copyfile/CopyFileParams.java rename to OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.java diff --git a/osmand-api/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl rename to OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/customization/CustomizationInfoParams.java b/OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/customization/CustomizationInfoParams.java rename to OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.java diff --git a/osmand-api/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl rename to OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java rename to OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java diff --git a/osmand-api/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl rename to OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/customization/OsmandSettingsParams.java b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/customization/OsmandSettingsParams.java rename to OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.java diff --git a/osmand-api/src/net/osmand/aidl/customization/SetWidgetsParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/customization/SetWidgetsParams.aidl rename to OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/customization/SetWidgetsParams.java b/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/customization/SetWidgetsParams.java rename to OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.java diff --git a/osmand-api/src/net/osmand/aidl/favorite/AFavorite.aidl b/OsmAnd/src/net/osmand/aidl/favorite/AFavorite.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/AFavorite.aidl rename to OsmAnd/src/net/osmand/aidl/favorite/AFavorite.aidl diff --git a/osmand-api/src/net/osmand/aidl/favorite/AFavorite.java b/OsmAnd/src/net/osmand/aidl/favorite/AFavorite.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/AFavorite.java rename to OsmAnd/src/net/osmand/aidl/favorite/AFavorite.java diff --git a/osmand-api/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl rename to OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/favorite/AddFavoriteParams.java b/OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/AddFavoriteParams.java rename to OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.java diff --git a/osmand-api/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl rename to OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java b/OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java rename to OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java diff --git a/osmand-api/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl rename to OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java b/OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java rename to OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java diff --git a/osmand-api/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl b/OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl rename to OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl diff --git a/osmand-api/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java b/OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java rename to OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java diff --git a/osmand-api/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl rename to OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java b/OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java rename to OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java diff --git a/osmand-api/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl rename to OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java b/OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java rename to OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java diff --git a/osmand-api/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl rename to OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java b/OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java rename to OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/AGpxBitmap.aidl b/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/AGpxBitmap.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/AGpxBitmap.java b/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/AGpxBitmap.java rename to OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/AGpxFile.aidl b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/AGpxFile.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/AGpxFile.java b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/AGpxFile.java rename to OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/AGpxFileDetails.java b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/AGpxFileDetails.java rename to OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl b/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/ASelectedGpxFile.java b/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/ASelectedGpxFile.java rename to OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java b/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java rename to OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/GpxColorParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/GpxColorParams.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/GpxColorParams.java b/OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/GpxColorParams.java rename to OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/HideGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/HideGpxParams.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/HideGpxParams.java b/OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/HideGpxParams.java rename to OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/ImportGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/ImportGpxParams.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/ImportGpxParams.java b/OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/ImportGpxParams.java rename to OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/RemoveGpxParams.java b/OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/RemoveGpxParams.java rename to OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/ShowGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/ShowGpxParams.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/ShowGpxParams.java b/OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/ShowGpxParams.java rename to OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java b/OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java rename to OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java diff --git a/osmand-api/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl rename to OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java b/OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java rename to OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java diff --git a/osmand-api/src/net/osmand/aidl/map/ALatLon.aidl b/OsmAnd/src/net/osmand/aidl/map/ALatLon.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/map/ALatLon.aidl rename to OsmAnd/src/net/osmand/aidl/map/ALatLon.aidl diff --git a/osmand-api/src/net/osmand/aidl/map/ALatLon.java b/OsmAnd/src/net/osmand/aidl/map/ALatLon.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/map/ALatLon.java rename to OsmAnd/src/net/osmand/aidl/map/ALatLon.java diff --git a/osmand-api/src/net/osmand/aidl/map/SetMapLocationParams.aidl b/OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/map/SetMapLocationParams.aidl rename to OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/map/SetMapLocationParams.java b/OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/map/SetMapLocationParams.java rename to OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/AMapLayer.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/AMapLayer.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/AMapLayer.java b/OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/AMapLayer.java rename to OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/AddMapLayerParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/AddMapLayerParams.java rename to OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java rename to OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java rename to OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/AMapPoint.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/AMapPoint.java rename to OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java rename to OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java rename to OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java rename to OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl rename to OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java rename to OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/AMapMarker.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/AMapMarker.aidl rename to OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/AMapMarker.java b/OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/AMapMarker.java rename to OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.java diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl rename to OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java b/OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java rename to OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl rename to OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java rename to OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl rename to OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java rename to OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl rename to OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java b/OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java rename to OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java diff --git a/osmand-api/src/net/osmand/aidl/mapwidget/AMapWidget.aidl b/OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapwidget/AMapWidget.aidl rename to OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapwidget/AMapWidget.java b/OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapwidget/AMapWidget.java rename to OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.java diff --git a/osmand-api/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl b/OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl rename to OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java b/OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java rename to OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java diff --git a/osmand-api/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl b/OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl rename to OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java b/OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java rename to OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java diff --git a/osmand-api/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl b/OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl rename to OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java b/OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java rename to OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java diff --git a/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl rename to OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java rename to OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java diff --git a/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl rename to OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java rename to OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java diff --git a/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl rename to OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl diff --git a/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerItem.java b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerItem.java rename to OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.java diff --git a/osmand-api/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl rename to OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java b/OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java rename to OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/ADirectionInfo.aidl b/OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/ADirectionInfo.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/ADirectionInfo.java b/OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/ADirectionInfo.java rename to OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java b/OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java b/OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/MuteNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/MuteNavigationParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/NavigateGpxParams.java b/OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/NavigateGpxParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/NavigateParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/NavigateParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/NavigateParams.java b/OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/NavigateParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/NavigateSearchParams.java b/OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/NavigateSearchParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/PauseNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/PauseNavigationParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/ResumeNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/ResumeNavigationParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/StopNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/StopNavigationParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/StopNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/StopNavigationParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.java diff --git a/osmand-api/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl rename to OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java rename to OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java diff --git a/osmand-api/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl rename to OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/note/StartAudioRecordingParams.java b/OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/note/StartAudioRecordingParams.java rename to OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.java diff --git a/osmand-api/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl rename to OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/note/StartVideoRecordingParams.java b/OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/note/StartVideoRecordingParams.java rename to OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.java diff --git a/osmand-api/src/net/osmand/aidl/note/StopRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/note/StopRecordingParams.aidl rename to OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/note/StopRecordingParams.java b/OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/note/StopRecordingParams.java rename to OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.java diff --git a/osmand-api/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl b/OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl rename to OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/note/TakePhotoNoteParams.java b/OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/note/TakePhotoNoteParams.java rename to OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.java diff --git a/osmand-api/src/net/osmand/aidl/plugins/PluginParams.aidl b/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/plugins/PluginParams.aidl rename to OsmAnd/src/net/osmand/aidl/plugins/PluginParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/plugins/PluginParams.java b/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/plugins/PluginParams.java rename to OsmAnd/src/net/osmand/aidl/plugins/PluginParams.java diff --git a/osmand-api/src/net/osmand/aidl/search/SearchParams.aidl b/OsmAnd/src/net/osmand/aidl/search/SearchParams.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/search/SearchParams.aidl rename to OsmAnd/src/net/osmand/aidl/search/SearchParams.aidl diff --git a/osmand-api/src/net/osmand/aidl/search/SearchParams.java b/OsmAnd/src/net/osmand/aidl/search/SearchParams.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/search/SearchParams.java rename to OsmAnd/src/net/osmand/aidl/search/SearchParams.java diff --git a/osmand-api/src/net/osmand/aidl/search/SearchResult.aidl b/OsmAnd/src/net/osmand/aidl/search/SearchResult.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/search/SearchResult.aidl rename to OsmAnd/src/net/osmand/aidl/search/SearchResult.aidl diff --git a/osmand-api/src/net/osmand/aidl/search/SearchResult.java b/OsmAnd/src/net/osmand/aidl/search/SearchResult.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/search/SearchResult.java rename to OsmAnd/src/net/osmand/aidl/search/SearchResult.java diff --git a/osmand-api/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl b/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl similarity index 100% rename from osmand-api/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl rename to OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl diff --git a/osmand-api/src/net/osmand/aidl/tiles/ASqliteDbFile.java b/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.java similarity index 100% rename from osmand-api/src/net/osmand/aidl/tiles/ASqliteDbFile.java rename to OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.java diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java index e089b98c48..ea97bf83d2 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java @@ -45,7 +45,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_ITEM_ID_SCHEME; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_ITEM_ID_SCHEME; public class OsmAndAppCustomization { diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 116573e385..4f407e8118 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -160,7 +160,7 @@ import java.util.concurrent.Executors; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; public class MapActivity extends OsmandActionBarActivity implements DownloadEvents, OnRequestPermissionsResultCallback, IRouteInformationListener, AMapPointUpdateListener, diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index ec2a26403f..6e8255f6f0 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -85,26 +85,26 @@ import java.util.List; import static net.osmand.plus.ContextMenuAdapter.PROFILES_CHOSEN_PROFILE_TAG; import static net.osmand.plus.ContextMenuAdapter.PROFILES_CONTROL_BUTTON_TAG; import static net.osmand.plus.ContextMenuAdapter.PROFILES_NORMAL_PROFILE_TAG; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_CONFIGURE_MAP_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_CONFIGURE_SCREEN_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_DASHBOARD_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_DIRECTIONS_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_DIVIDER_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_DOWNLOAD_MAPS_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_HELP_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_MAP_MARKERS_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_MEASURE_DISTANCE_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_MY_PLACES_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_OSMAND_LIVE_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_PLUGINS_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_SEARCH_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_TRAVEL_GUIDES_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_ADD_GPX_WAYPOINT; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_DIRECTIONS_FROM_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_EDIT_GPX_WP; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MEASURE_DISTANCE; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_SEARCH_NEARBY; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_CONFIGURE_MAP_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_CONFIGURE_SCREEN_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DASHBOARD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DIRECTIONS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DIVIDER_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DOWNLOAD_MAPS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_HELP_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_MAP_MARKERS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_MEASURE_DISTANCE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_MY_PLACES_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_OSMAND_LIVE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_PLUGINS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SEARCH_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_TRAVEL_GUIDES_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_ADD_GPX_WAYPOINT; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_DIRECTIONS_FROM_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_EDIT_GPX_WP; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MEASURE_DISTANCE; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_SEARCH_NEARBY; import static net.osmand.plus.helpers.ImportHelper.GPX_SUFFIX; diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index 7957076f41..061fbdc57b 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -91,7 +91,7 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import static net.osmand.OsmAndCustomizationConstants.RECORDING_LAYER; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.RECORDING_LAYER; public class AudioVideoNotesPlugin extends OsmandPlugin { diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java index de5c430a84..527fb03d9e 100644 --- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java +++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java @@ -18,7 +18,7 @@ import net.osmand.plus.views.OsmandMapLayer.DrawSettings; import net.osmand.plus.views.OsmandMapTileView; import net.osmand.plus.views.mapwidgets.TextInfoWidget; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_BUILDS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_BUILDS_ID; public class OsmandDevelopmentPlugin extends OsmandPlugin { private static final String ID = "osmand.development"; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index de3edefaba..5b06667a68 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -70,27 +70,27 @@ import java.util.Map; import gnu.trove.list.array.TIntArrayList; -import static net.osmand.OsmAndCustomizationConstants.APP_PROFILES_ID; -import static net.osmand.OsmAndCustomizationConstants.CUSTOM_RENDERING_ITEMS_ID_SCHEME; -import static net.osmand.OsmAndCustomizationConstants.DETAILS_ID; -import static net.osmand.OsmAndCustomizationConstants.FAVORITES_ID; -import static net.osmand.OsmAndCustomizationConstants.GPX_FILES_ID; -import static net.osmand.OsmAndCustomizationConstants.HIDE_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_LANGUAGE_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_MAGNIFIER_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_MARKERS_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_MODE_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_RENDERING_CATEGORY_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_SOURCE_ID; -import static net.osmand.OsmAndCustomizationConstants.MAP_STYLE_ID; -import static net.osmand.OsmAndCustomizationConstants.POI_OVERLAY_ID; -import static net.osmand.OsmAndCustomizationConstants.POI_OVERLAY_LABELS_ID; -import static net.osmand.OsmAndCustomizationConstants.ROAD_STYLE_ID; -import static net.osmand.OsmAndCustomizationConstants.ROUTES_ID; -import static net.osmand.OsmAndCustomizationConstants.SHOW_CATEGORY_ID; -import static net.osmand.OsmAndCustomizationConstants.TEXT_SIZE_ID; -import static net.osmand.OsmAndCustomizationConstants.TRANSPORT_ID; -import static net.osmand.OsmAndCustomizationConstants.TRANSPORT_RENDERING_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.APP_PROFILES_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.CUSTOM_RENDERING_ITEMS_ID_SCHEME; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DETAILS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.FAVORITES_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.GPX_FILES_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.HIDE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_LANGUAGE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_MAGNIFIER_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_MARKERS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_MODE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_RENDERING_CATEGORY_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_SOURCE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_STYLE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.POI_OVERLAY_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.POI_OVERLAY_LABELS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.ROAD_STYLE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.ROUTES_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.SHOW_CATEGORY_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.TEXT_SIZE_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.TRANSPORT_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.TRANSPORT_RENDERING_ID; import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_DENSITY_ATTR; import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_ATTR; import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_SCHEME_ATTR; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java index 56ec551a7f..f4e3be4253 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java @@ -13,7 +13,7 @@ import android.util.Pair; import net.osmand.aidl.AidlContextMenuButtonWrapper; import net.osmand.aidl.AidlContextMenuButtonsWrapper; import net.osmand.aidl.AidlMapPointWrapper; -import net.osmand.aidl2.maplayer.point.AMapPoint; +import net.osmand.aidlapi.maplayer.point.AMapPoint; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.plus.OsmAndFormatter; diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java index 7a344be3a0..d8d8572218 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java @@ -39,7 +39,7 @@ import java.text.MessageFormat; import java.util.List; import static android.content.Intent.ACTION_VIEW; -import static net.osmand.OsmAndCustomizationConstants.MAPILLARY; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAPILLARY; public class MapillaryPlugin extends OsmandPlugin { public static final String ID = "osmand.mapillary"; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index 74a7ffc730..56277f0caa 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java @@ -47,12 +47,12 @@ import org.apache.commons.logging.Log; import java.util.List; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_CREATE_POI; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_CHANGE; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_NOTE; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_POI; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_OPEN_OSM_NOTE; -import static net.osmand.OsmAndCustomizationConstants.OSM_NOTES; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_CREATE_POI; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_CHANGE; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_NOTE; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_POI; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_OPEN_OSM_NOTE; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.OSM_NOTES; public class OsmEditingPlugin extends OsmandPlugin { diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index 8983eb1a68..c0a633d51d 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java @@ -1,7 +1,7 @@ package net.osmand.plus.parkingpoint; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MARK_AS_PARKING_LOC; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MARK_AS_PARKING_LOC; import android.app.Activity; import android.content.DialogInterface; diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java index 1f66fb2954..93cfe27843 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java @@ -66,7 +66,7 @@ import java.util.Map.Entry; import studio.carbonylgroup.textfieldboxes.ExtendedEditText; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.DIALOG_TYPE; import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.SELECTED_KEY; import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.TYPE_BASE_APP_PROFILE; diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java index c69e18aeff..1b06c9b3fd 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java @@ -46,10 +46,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_DOWNLOAD_MAP; -import static net.osmand.OsmAndCustomizationConstants.OVERLAY_MAP; -import static net.osmand.OsmAndCustomizationConstants.UNDERLAY_MAP; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_UPDATE_MAP; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_DOWNLOAD_MAP; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.OVERLAY_MAP; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.UNDERLAY_MAP; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_UPDATE_MAP; public class OsmandRasterMapsPlugin extends OsmandPlugin { public static final String ID = "osmand.rastermaps"; diff --git a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java index 7230a6bca1..7ede734aea 100644 --- a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java @@ -60,7 +60,7 @@ import net.osmand.util.Algorithms; import org.apache.commons.logging.Log; -import static net.osmand.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; public abstract class BaseSettingsFragment extends PreferenceFragmentCompat implements OnPreferenceChangeListener, OnPreferenceClickListener, AppModeChangedListener { diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java index 92f5e4ff2d..d7bf1b1174 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java @@ -29,8 +29,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static net.osmand.OsmAndCustomizationConstants.CONTOUR_LINES; -import static net.osmand.OsmAndCustomizationConstants.HILLSHADE_LAYER; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.CONTOUR_LINES; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.HILLSHADE_LAYER; public class SRTMPlugin extends OsmandPlugin { diff --git a/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java b/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java index 8d6044090d..270581e5dd 100644 --- a/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java @@ -18,7 +18,7 @@ import android.text.TextUtils; import net.osmand.AndroidUtils; import net.osmand.aidl.AidlMapLayerWrapper; import net.osmand.aidl.AidlMapPointWrapper; -import net.osmand.aidl2.maplayer.point.AMapPoint; +import net.osmand.aidlapi.maplayer.point.AMapPoint; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; import net.osmand.data.RotatedTileBox; diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java index e37ed3728a..7486f6a9eb 100644 --- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java @@ -76,7 +76,7 @@ import java.util.Set; import gnu.trove.list.array.TIntArrayList; -import static net.osmand.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_CHANGE_MARKER_POSITION; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_CHANGE_MARKER_POSITION; public class ContextMenuLayer extends OsmandMapLayer { //private static final Log LOG = PlatformUtil.getLog(ContextMenuLayer.class); diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index d5f6da6fac..2b97229ffd 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -63,14 +63,14 @@ import java.util.List; import gnu.trove.list.array.TIntArrayList; -import static net.osmand.OsmAndCustomizationConstants.BACK_TO_LOC_HUD_ID; -import static net.osmand.OsmAndCustomizationConstants.COMPASS_HUD_ID; -import static net.osmand.OsmAndCustomizationConstants.LAYERS_HUD_ID; -import static net.osmand.OsmAndCustomizationConstants.MENU_HUD_ID; -import static net.osmand.OsmAndCustomizationConstants.QUICK_SEARCH_HUD_ID; -import static net.osmand.OsmAndCustomizationConstants.ROUTE_PLANNING_HUD_ID; -import static net.osmand.OsmAndCustomizationConstants.ZOOM_IN_HUD_ID; -import static net.osmand.OsmAndCustomizationConstants.ZOOM_OUT_HUD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.BACK_TO_LOC_HUD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.COMPASS_HUD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.LAYERS_HUD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.MENU_HUD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.QUICK_SEARCH_HUD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.ROUTE_PLANNING_HUD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.ZOOM_IN_HUD_ID; +import static net.osmand.aidlapi.OsmAndCustomizationConstants.ZOOM_OUT_HUD_ID; public class MapControlsLayer extends OsmandMapLayer { diff --git a/osmand-api/src/net/osmand/OsmandAidlConstants.java b/osmand-api/src/net/osmand/OsmandAidlConstants.java deleted file mode 100644 index c0a78543fa..0000000000 --- a/osmand-api/src/net/osmand/OsmandAidlConstants.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.osmand; - -public interface OsmandAidlConstants { - - int OK_RESPONSE = 0; - - int MIN_UPDATE_TIME_MS = 1000; - long COPY_FILE_PART_SIZE_LIMIT = 256 * 1024; - long COPY_FILE_MAX_LOCK_TIME_MS = 10000; - - int CANNOT_ACCESS_API_ERROR = -5; - int UNKNOWN_API_ERROR = -2; - - int MIN_UPDATE_TIME_MS_ERROR = -1; - - int COPY_FILE_PARAMS_ERROR = -1001; - int COPY_FILE_PART_SIZE_LIMIT_ERROR = -1002; - int COPY_FILE_WRITE_LOCK_ERROR = -1003; - int COPY_FILE_IO_ERROR = -1004; - int COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR = -1005; - - int TURN_TYPE_C = 1;//"C"; // continue (go straight) //$NON-NLS-1$ - int TURN_TYPE_TL = 2; // turn left //$NON-NLS-1$ - int TURN_TYPE_TSLL = 3; // turn slightly left //$NON-NLS-1$ - int TURN_TYPE_TSHL = 4; // turn sharply left //$NON-NLS-1$ - int TURN_TYPE_TR = 5; // turn right //$NON-NLS-1$ - int TURN_TYPE_TSLR = 6; // turn slightly right //$NON-NLS-1$ - int TURN_TYPE_TSHR = 7; // turn sharply right //$NON-NLS-1$ - int TURN_TYPE_KL = 8; // keep left //$NON-NLS-1$ - int TURN_TYPE_KR = 9; // keep right//$NON-NLS-1$ - int TURN_TYPE_TU = 10; // U-turn //$NON-NLS-1$ - int TURN_TYPE_TRU = 11; // Right U-turn //$NON-NLS-1$ - int TURN_TYPE_OFFR = 12; // Off route //$NON-NLS-1$ - int TURN_TYPE_RNDB = 13; // Roundabout - int TURN_TYPE_RNLB = 14; // Roundabout left -} diff --git a/osmand-api/src/net/osmand/aidl2/calculateroute/CalculateRouteParams.aidl b/osmand-api/src/net/osmand/aidl2/calculateroute/CalculateRouteParams.aidl deleted file mode 100644 index 9537d3e2be..0000000000 --- a/osmand-api/src/net/osmand/aidl2/calculateroute/CalculateRouteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.calculateroute; - -parcelable CalculateRouteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/contextmenu/AContextMenuButton.aidl b/osmand-api/src/net/osmand/aidl2/contextmenu/AContextMenuButton.aidl deleted file mode 100644 index 66124e63f6..0000000000 --- a/osmand-api/src/net/osmand/aidl2/contextmenu/AContextMenuButton.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.contextmenu; - -parcelable AContextMenuButton; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/contextmenu/ContextMenuButtonsParams.aidl b/osmand-api/src/net/osmand/aidl2/contextmenu/ContextMenuButtonsParams.aidl deleted file mode 100644 index a444c59ce7..0000000000 --- a/osmand-api/src/net/osmand/aidl2/contextmenu/ContextMenuButtonsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.contextmenu; - -parcelable ContextMenuButtonsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/copyfile/CopyFileParams.aidl b/osmand-api/src/net/osmand/aidl2/copyfile/CopyFileParams.aidl deleted file mode 100644 index e980875cd4..0000000000 --- a/osmand-api/src/net/osmand/aidl2/copyfile/CopyFileParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.copyfile; - -parcelable CopyFileParams; diff --git a/osmand-api/src/net/osmand/aidl2/customization/CustomizationInfoParams.aidl b/osmand-api/src/net/osmand/aidl2/customization/CustomizationInfoParams.aidl deleted file mode 100644 index 2cdc736d6c..0000000000 --- a/osmand-api/src/net/osmand/aidl2/customization/CustomizationInfoParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.customization; - -parcelable CustomizationInfoParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsInfoParams.aidl b/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsInfoParams.aidl deleted file mode 100644 index c1001f3cbd..0000000000 --- a/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsInfoParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.customization; - -parcelable OsmandSettingsInfoParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsParams.aidl b/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsParams.aidl deleted file mode 100644 index 48d36dba03..0000000000 --- a/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.customization; - -parcelable OsmandSettingsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/customization/SetWidgetsParams.aidl b/osmand-api/src/net/osmand/aidl2/customization/SetWidgetsParams.aidl deleted file mode 100644 index 6b57aa1e00..0000000000 --- a/osmand-api/src/net/osmand/aidl2/customization/SetWidgetsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.customization; - -parcelable SetWidgetsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/AFavorite.aidl b/osmand-api/src/net/osmand/aidl2/favorite/AFavorite.aidl deleted file mode 100644 index ec812d9fa0..0000000000 --- a/osmand-api/src/net/osmand/aidl2/favorite/AFavorite.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.favorite; - -parcelable AFavorite; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/AddFavoriteParams.aidl b/osmand-api/src/net/osmand/aidl2/favorite/AddFavoriteParams.aidl deleted file mode 100644 index c37fb983c8..0000000000 --- a/osmand-api/src/net/osmand/aidl2/favorite/AddFavoriteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.favorite; - -parcelable AddFavoriteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/RemoveFavoriteParams.aidl b/osmand-api/src/net/osmand/aidl2/favorite/RemoveFavoriteParams.aidl deleted file mode 100644 index 0b945cbfba..0000000000 --- a/osmand-api/src/net/osmand/aidl2/favorite/RemoveFavoriteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.favorite; - -parcelable RemoveFavoriteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/UpdateFavoriteParams.aidl b/osmand-api/src/net/osmand/aidl2/favorite/UpdateFavoriteParams.aidl deleted file mode 100644 index 8abbcf07e8..0000000000 --- a/osmand-api/src/net/osmand/aidl2/favorite/UpdateFavoriteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.favorite; - -parcelable UpdateFavoriteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/group/AFavoriteGroup.aidl b/osmand-api/src/net/osmand/aidl2/favorite/group/AFavoriteGroup.aidl deleted file mode 100644 index 08ba7ec1cd..0000000000 --- a/osmand-api/src/net/osmand/aidl2/favorite/group/AFavoriteGroup.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.favorite.group; - -parcelable AFavoriteGroup; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/group/AddFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidl2/favorite/group/AddFavoriteGroupParams.aidl deleted file mode 100644 index 6dfef5a427..0000000000 --- a/osmand-api/src/net/osmand/aidl2/favorite/group/AddFavoriteGroupParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.favorite.group; - -parcelable AddFavoriteGroupParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/group/RemoveFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidl2/favorite/group/RemoveFavoriteGroupParams.aidl deleted file mode 100644 index 615df55873..0000000000 --- a/osmand-api/src/net/osmand/aidl2/favorite/group/RemoveFavoriteGroupParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.favorite.group; - -parcelable RemoveFavoriteGroupParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/group/UpdateFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidl2/favorite/group/UpdateFavoriteGroupParams.aidl deleted file mode 100644 index be861c39e2..0000000000 --- a/osmand-api/src/net/osmand/aidl2/favorite/group/UpdateFavoriteGroupParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.favorite.group; - -parcelable UpdateFavoriteGroupParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/AGpxBitmap.aidl b/osmand-api/src/net/osmand/aidl2/gpx/AGpxBitmap.aidl deleted file mode 100644 index 4f0bf9ddac..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/AGpxBitmap.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable AGpxBitmap; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/AGpxFile.aidl b/osmand-api/src/net/osmand/aidl2/gpx/AGpxFile.aidl deleted file mode 100644 index 6759c2eb6d..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/AGpxFile.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable AGpxFile; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/AGpxFileDetails.aidl b/osmand-api/src/net/osmand/aidl2/gpx/AGpxFileDetails.aidl deleted file mode 100644 index 7d174bb9c6..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/AGpxFileDetails.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable AGpxFileDetails; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/ASelectedGpxFile.aidl b/osmand-api/src/net/osmand/aidl2/gpx/ASelectedGpxFile.aidl deleted file mode 100644 index f9a614afd7..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/ASelectedGpxFile.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable ASelectedGpxFile; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/GpxColorParams.aidl b/osmand-api/src/net/osmand/aidl2/gpx/GpxColorParams.aidl deleted file mode 100644 index cd9c65cdae..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/GpxColorParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable GpxColorParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/HideGpxParams.aidl b/osmand-api/src/net/osmand/aidl2/gpx/HideGpxParams.aidl deleted file mode 100644 index 9e8db29638..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/HideGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable HideGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/ImportGpxParams.aidl b/osmand-api/src/net/osmand/aidl2/gpx/ImportGpxParams.aidl deleted file mode 100644 index cd16284cc0..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/ImportGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable ImportGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/RemoveGpxParams.aidl b/osmand-api/src/net/osmand/aidl2/gpx/RemoveGpxParams.aidl deleted file mode 100644 index 8284b18eaf..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/RemoveGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable RemoveGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/ShowGpxParams.aidl b/osmand-api/src/net/osmand/aidl2/gpx/ShowGpxParams.aidl deleted file mode 100644 index 26212448c3..0000000000 --- a/osmand-api/src/net/osmand/aidl2/gpx/ShowGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.gpx; - -parcelable ShowGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/map/ALatLon.aidl b/osmand-api/src/net/osmand/aidl2/map/ALatLon.aidl deleted file mode 100644 index 0df27c4da1..0000000000 --- a/osmand-api/src/net/osmand/aidl2/map/ALatLon.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.map; - -parcelable ALatLon; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/AMapLayer.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/AMapLayer.aidl deleted file mode 100644 index 1172f6591b..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/AMapLayer.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer; - -parcelable AMapLayer; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/AddMapLayerParams.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/AddMapLayerParams.aidl deleted file mode 100644 index 0970b67edd..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/AddMapLayerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer; - -parcelable AddMapLayerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/RemoveMapLayerParams.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/RemoveMapLayerParams.aidl deleted file mode 100644 index 0f22508f30..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/RemoveMapLayerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer; - -parcelable RemoveMapLayerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/UpdateMapLayerParams.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/UpdateMapLayerParams.aidl deleted file mode 100644 index a6f285c40d..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/UpdateMapLayerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer; - -parcelable UpdateMapLayerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/AMapPoint.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/point/AMapPoint.aidl deleted file mode 100644 index a519b92d98..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/AMapPoint.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer.point; - -parcelable AMapPoint; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/AddMapPointParams.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/point/AddMapPointParams.aidl deleted file mode 100644 index 9edfccde6d..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/AddMapPointParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer.point; - -parcelable AddMapPointParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/RemoveMapPointParams.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/point/RemoveMapPointParams.aidl deleted file mode 100644 index 0e479d40b7..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/RemoveMapPointParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer.point; - -parcelable RemoveMapPointParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/ShowMapPointParams.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/point/ShowMapPointParams.aidl deleted file mode 100644 index 3dec3c519f..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/ShowMapPointParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer.point; - -parcelable ShowMapPointParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/UpdateMapPointParams.aidl b/osmand-api/src/net/osmand/aidl2/maplayer/point/UpdateMapPointParams.aidl deleted file mode 100644 index 5bf66d6488..0000000000 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/UpdateMapPointParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.maplayer.point; - -parcelable UpdateMapPointParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/AMapMarker.aidl b/osmand-api/src/net/osmand/aidl2/mapmarker/AMapMarker.aidl deleted file mode 100644 index 3829f596c5..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/AMapMarker.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapmarker; - -parcelable AMapMarker; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/AddMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidl2/mapmarker/AddMapMarkerParams.aidl deleted file mode 100644 index 6ddad1332b..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/AddMapMarkerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapmarker; - -parcelable AddMapMarkerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkerParams.aidl deleted file mode 100644 index 8321b28def..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapmarker; - -parcelable RemoveMapMarkerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkersParams.aidl b/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkersParams.aidl deleted file mode 100644 index a837536119..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkersParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapmarker; - -parcelable RemoveMapMarkersParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/UpdateMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidl2/mapmarker/UpdateMapMarkerParams.aidl deleted file mode 100644 index 3be8fb20bb..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/UpdateMapMarkerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapmarker; - -parcelable UpdateMapMarkerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapwidget/AMapWidget.aidl b/osmand-api/src/net/osmand/aidl2/mapwidget/AMapWidget.aidl deleted file mode 100644 index 725fa9386f..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapwidget/AMapWidget.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapwidget; - -parcelable AMapWidget; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapwidget/AddMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidl2/mapwidget/AddMapWidgetParams.aidl deleted file mode 100644 index e31ce24329..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapwidget/AddMapWidgetParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapwidget; - -parcelable AddMapWidgetParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapwidget/RemoveMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidl2/mapwidget/RemoveMapWidgetParams.aidl deleted file mode 100644 index 3db50bf521..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapwidget/RemoveMapWidgetParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapwidget; - -parcelable RemoveMapWidgetParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapwidget/UpdateMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidl2/mapwidget/UpdateMapWidgetParams.aidl deleted file mode 100644 index ceb3034dc9..0000000000 --- a/osmand-api/src/net/osmand/aidl2/mapwidget/UpdateMapWidgetParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.mapwidget; - -parcelable UpdateMapWidgetParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerFooterParams.aidl b/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerFooterParams.aidl deleted file mode 100644 index c41af010c7..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerFooterParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navdrawer; - -parcelable NavDrawerFooterParams; diff --git a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerHeaderParams.aidl b/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerHeaderParams.aidl deleted file mode 100644 index 94f16194a6..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerHeaderParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navdrawer; - -parcelable NavDrawerHeaderParams; diff --git a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerItem.aidl b/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerItem.aidl deleted file mode 100644 index 9e0046d683..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerItem.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navdrawer; - -parcelable NavDrawerItem; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navdrawer/SetNavDrawerItemsParams.aidl b/osmand-api/src/net/osmand/aidl2/navdrawer/SetNavDrawerItemsParams.aidl deleted file mode 100644 index dbc08a62d2..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navdrawer/SetNavDrawerItemsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navdrawer; - -parcelable SetNavDrawerItemsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/ADirectionInfo.aidl b/osmand-api/src/net/osmand/aidl2/navigation/ADirectionInfo.aidl deleted file mode 100644 index 0ff4db92a5..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/ADirectionInfo.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable ADirectionInfo; diff --git a/osmand-api/src/net/osmand/aidl2/navigation/ANavigationUpdateParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/ANavigationUpdateParams.aidl deleted file mode 100644 index c4913be3d4..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/ANavigationUpdateParams.aidl +++ /dev/null @@ -1,4 +0,0 @@ - -package net.osmand.aidl2.navigation; - -parcelable ANavigationUpdateParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/MuteNavigationParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/MuteNavigationParams.aidl deleted file mode 100644 index 9833c7f643..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/MuteNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable MuteNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/NavigateGpxParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/NavigateGpxParams.aidl deleted file mode 100644 index f92da795b7..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/NavigateGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable NavigateGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/NavigateParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/NavigateParams.aidl deleted file mode 100644 index 1012bd24f0..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/NavigateParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable NavigateParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/NavigateSearchParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/NavigateSearchParams.aidl deleted file mode 100644 index ee10b8091d..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/NavigateSearchParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable NavigateSearchParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/OnVoiceNavigationParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/OnVoiceNavigationParams.aidl deleted file mode 100644 index a5f9a35694..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/OnVoiceNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable OnVoiceNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/PauseNavigationParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/PauseNavigationParams.aidl deleted file mode 100644 index 74cced1091..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/PauseNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable PauseNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/ResumeNavigationParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/ResumeNavigationParams.aidl deleted file mode 100644 index 24f601379d..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/ResumeNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable ResumeNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/StopNavigationParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/StopNavigationParams.aidl deleted file mode 100644 index d363d97b04..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/StopNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable StopNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/UnmuteNavigationParams.aidl b/osmand-api/src/net/osmand/aidl2/navigation/UnmuteNavigationParams.aidl deleted file mode 100644 index 333613b3f1..0000000000 --- a/osmand-api/src/net/osmand/aidl2/navigation/UnmuteNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.navigation; - -parcelable UnmuteNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/note/StopRecordingParams.aidl b/osmand-api/src/net/osmand/aidl2/note/StopRecordingParams.aidl deleted file mode 100644 index 650de5adc2..0000000000 --- a/osmand-api/src/net/osmand/aidl2/note/StopRecordingParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.note; - -parcelable StopRecordingParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/note/TakePhotoNoteParams.aidl b/osmand-api/src/net/osmand/aidl2/note/TakePhotoNoteParams.aidl deleted file mode 100644 index 55b878e743..0000000000 --- a/osmand-api/src/net/osmand/aidl2/note/TakePhotoNoteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.note; - -parcelable TakePhotoNoteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/search/SearchParams.aidl b/osmand-api/src/net/osmand/aidl2/search/SearchParams.aidl deleted file mode 100644 index b4b6da7e7a..0000000000 --- a/osmand-api/src/net/osmand/aidl2/search/SearchParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.search; - -parcelable SearchParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/search/SearchResult.aidl b/osmand-api/src/net/osmand/aidl2/search/SearchResult.aidl deleted file mode 100644 index 9309aab235..0000000000 --- a/osmand-api/src/net/osmand/aidl2/search/SearchResult.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.search; - -parcelable SearchResult; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/tiles/ASqliteDbFile.aidl b/osmand-api/src/net/osmand/aidl2/tiles/ASqliteDbFile.aidl deleted file mode 100644 index 6b35e3d044..0000000000 --- a/osmand-api/src/net/osmand/aidl2/tiles/ASqliteDbFile.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl2.tiles; - -parcelable ASqliteDbFile; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/AidlParams.java b/osmand-api/src/net/osmand/aidlapi/AidlParams.java similarity index 88% rename from osmand-api/src/net/osmand/aidl2/AidlParams.java rename to osmand-api/src/net/osmand/aidlapi/AidlParams.java index 376ecaa2ef..6024c5fcae 100644 --- a/osmand-api/src/net/osmand/aidl2/AidlParams.java +++ b/osmand-api/src/net/osmand/aidlapi/AidlParams.java @@ -1,4 +1,4 @@ -package net.osmand.aidl2; +package net.osmand.aidlapi; import android.os.Bundle; import android.os.Parcel; @@ -13,7 +13,7 @@ public abstract class AidlParams implements Parcelable { dest.writeBundle(bundle); } - protected final void readFromParcel(Parcel in) { + public final void readFromParcel(Parcel in) { Bundle bundle = in.readBundle(getClass().getClassLoader()); if (bundle != null) { readFromBundle(bundle); diff --git a/osmand-api/src/net/osmand/aidl2/IOsmAndAidlCallback.aidl b/osmand-api/src/net/osmand/aidlapi/IOsmAndAidlCallback.aidl similarity index 86% rename from osmand-api/src/net/osmand/aidl2/IOsmAndAidlCallback.aidl rename to osmand-api/src/net/osmand/aidlapi/IOsmAndAidlCallback.aidl index e261a59018..1d7f954815 100644 --- a/osmand-api/src/net/osmand/aidl2/IOsmAndAidlCallback.aidl +++ b/osmand-api/src/net/osmand/aidlapi/IOsmAndAidlCallback.aidl @@ -1,9 +1,9 @@ -package net.osmand.aidl2; +package net.osmand.aidlapi; -import net.osmand.aidl2.search.SearchResult; -import net.osmand.aidl2.gpx.AGpxBitmap; -import net.osmand.aidl2.navigation.ADirectionInfo; -import net.osmand.aidl2.navigation.OnVoiceNavigationParams; +import net.osmand.aidlapi.search.SearchResult; +import net.osmand.aidlapi.gpx.AGpxBitmap; +import net.osmand.aidlapi.navigation.ADirectionInfo; +import net.osmand.aidlapi.navigation.OnVoiceNavigationParams; interface IOsmAndAidlCallback { diff --git a/osmand-api/src/net/osmand/aidl2/IOsmAndAidlInterface.aidl b/osmand-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl similarity index 89% rename from osmand-api/src/net/osmand/aidl2/IOsmAndAidlInterface.aidl rename to osmand-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl index b5558cdcdd..e8729e3a40 100644 --- a/osmand-api/src/net/osmand/aidl2/IOsmAndAidlInterface.aidl +++ b/osmand-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl @@ -1,97 +1,97 @@ -package net.osmand.aidl2; +package net.osmand.aidlapi; -import net.osmand.aidl2.map.ALatLon; -import net.osmand.aidl2.map.SetMapLocationParams; +import net.osmand.aidlapi.map.ALatLon; +import net.osmand.aidlapi.map.SetMapLocationParams; -import net.osmand.aidl2.favorite.group.AFavoriteGroup; -import net.osmand.aidl2.favorite.group.AddFavoriteGroupParams; -import net.osmand.aidl2.favorite.group.RemoveFavoriteGroupParams; -import net.osmand.aidl2.favorite.group.UpdateFavoriteGroupParams; +import net.osmand.aidlapi.favorite.group.AFavoriteGroup; +import net.osmand.aidlapi.favorite.group.AddFavoriteGroupParams; +import net.osmand.aidlapi.favorite.group.RemoveFavoriteGroupParams; +import net.osmand.aidlapi.favorite.group.UpdateFavoriteGroupParams; -import net.osmand.aidl2.favorite.AFavorite; -import net.osmand.aidl2.favorite.AddFavoriteParams; -import net.osmand.aidl2.favorite.RemoveFavoriteParams; -import net.osmand.aidl2.favorite.UpdateFavoriteParams; +import net.osmand.aidlapi.favorite.AFavorite; +import net.osmand.aidlapi.favorite.AddFavoriteParams; +import net.osmand.aidlapi.favorite.RemoveFavoriteParams; +import net.osmand.aidlapi.favorite.UpdateFavoriteParams; -import net.osmand.aidl2.mapmarker.AMapMarker; -import net.osmand.aidl2.mapmarker.AddMapMarkerParams; -import net.osmand.aidl2.mapmarker.RemoveMapMarkerParams; -import net.osmand.aidl2.mapmarker.UpdateMapMarkerParams; +import net.osmand.aidlapi.mapmarker.AMapMarker; +import net.osmand.aidlapi.mapmarker.AddMapMarkerParams; +import net.osmand.aidlapi.mapmarker.RemoveMapMarkerParams; +import net.osmand.aidlapi.mapmarker.UpdateMapMarkerParams; -import net.osmand.aidl2.calculateroute.CalculateRouteParams; +import net.osmand.aidlapi.calculateroute.CalculateRouteParams; -import net.osmand.aidl2.gpx.ImportGpxParams; -import net.osmand.aidl2.gpx.ShowGpxParams; -import net.osmand.aidl2.gpx.StartGpxRecordingParams; -import net.osmand.aidl2.gpx.StopGpxRecordingParams; -import net.osmand.aidl2.gpx.HideGpxParams; -import net.osmand.aidl2.gpx.ASelectedGpxFile; +import net.osmand.aidlapi.gpx.ImportGpxParams; +import net.osmand.aidlapi.gpx.ShowGpxParams; +import net.osmand.aidlapi.gpx.StartGpxRecordingParams; +import net.osmand.aidlapi.gpx.StopGpxRecordingParams; +import net.osmand.aidlapi.gpx.HideGpxParams; +import net.osmand.aidlapi.gpx.ASelectedGpxFile; -import net.osmand.aidl2.mapwidget.AMapWidget; -import net.osmand.aidl2.mapwidget.AddMapWidgetParams; -import net.osmand.aidl2.mapwidget.RemoveMapWidgetParams; -import net.osmand.aidl2.mapwidget.UpdateMapWidgetParams; +import net.osmand.aidlapi.mapwidget.AMapWidget; +import net.osmand.aidlapi.mapwidget.AddMapWidgetParams; +import net.osmand.aidlapi.mapwidget.RemoveMapWidgetParams; +import net.osmand.aidlapi.mapwidget.UpdateMapWidgetParams; -import net.osmand.aidl2.maplayer.point.AMapPoint; -import net.osmand.aidl2.maplayer.point.AddMapPointParams; -import net.osmand.aidl2.maplayer.point.RemoveMapPointParams; -import net.osmand.aidl2.maplayer.point.UpdateMapPointParams; -import net.osmand.aidl2.maplayer.AMapLayer; -import net.osmand.aidl2.maplayer.AddMapLayerParams; -import net.osmand.aidl2.maplayer.RemoveMapLayerParams; -import net.osmand.aidl2.maplayer.UpdateMapLayerParams; +import net.osmand.aidlapi.maplayer.point.AMapPoint; +import net.osmand.aidlapi.maplayer.point.AddMapPointParams; +import net.osmand.aidlapi.maplayer.point.RemoveMapPointParams; +import net.osmand.aidlapi.maplayer.point.UpdateMapPointParams; +import net.osmand.aidlapi.maplayer.AMapLayer; +import net.osmand.aidlapi.maplayer.AddMapLayerParams; +import net.osmand.aidlapi.maplayer.RemoveMapLayerParams; +import net.osmand.aidlapi.maplayer.UpdateMapLayerParams; -import net.osmand.aidl2.navigation.NavigateParams; -import net.osmand.aidl2.navigation.NavigateGpxParams; +import net.osmand.aidlapi.navigation.NavigateParams; +import net.osmand.aidlapi.navigation.NavigateGpxParams; -import net.osmand.aidl2.note.TakePhotoNoteParams; -import net.osmand.aidl2.note.StartVideoRecordingParams; -import net.osmand.aidl2.note.StartAudioRecordingParams; -import net.osmand.aidl2.note.StopRecordingParams; +import net.osmand.aidlapi.note.TakePhotoNoteParams; +import net.osmand.aidlapi.note.StartVideoRecordingParams; +import net.osmand.aidlapi.note.StartAudioRecordingParams; +import net.osmand.aidlapi.note.StopRecordingParams; -import net.osmand.aidl2.gpx.RemoveGpxParams; +import net.osmand.aidlapi.gpx.RemoveGpxParams; -import net.osmand.aidl2.maplayer.point.ShowMapPointParams; +import net.osmand.aidlapi.maplayer.point.ShowMapPointParams; -import net.osmand.aidl2.navdrawer.SetNavDrawerItemsParams; -import net.osmand.aidl2.navdrawer.NavDrawerFooterParams; -import net.osmand.aidl2.navdrawer.NavDrawerHeaderParams; +import net.osmand.aidlapi.navdrawer.SetNavDrawerItemsParams; +import net.osmand.aidlapi.navdrawer.NavDrawerFooterParams; +import net.osmand.aidlapi.navdrawer.NavDrawerHeaderParams; -import net.osmand.aidl2.navigation.PauseNavigationParams; -import net.osmand.aidl2.navigation.ResumeNavigationParams; -import net.osmand.aidl2.navigation.StopNavigationParams; -import net.osmand.aidl2.navigation.MuteNavigationParams; -import net.osmand.aidl2.navigation.UnmuteNavigationParams; +import net.osmand.aidlapi.navigation.PauseNavigationParams; +import net.osmand.aidlapi.navigation.ResumeNavigationParams; +import net.osmand.aidlapi.navigation.StopNavigationParams; +import net.osmand.aidlapi.navigation.MuteNavigationParams; +import net.osmand.aidlapi.navigation.UnmuteNavigationParams; -import net.osmand.aidl2.IOsmAndAidlCallback; +import net.osmand.aidlapi.IOsmAndAidlCallback; -import net.osmand.aidl2.search.SearchResult; -import net.osmand.aidl2.search.SearchParams; -import net.osmand.aidl2.navigation.NavigateSearchParams; +import net.osmand.aidlapi.search.SearchResult; +import net.osmand.aidlapi.search.SearchParams; +import net.osmand.aidlapi.navigation.NavigateSearchParams; -import net.osmand.aidl2.customization.SetWidgetsParams; -import net.osmand.aidl2.customization.OsmandSettingsParams; -import net.osmand.aidl2.customization.OsmandSettingsInfoParams; -import net.osmand.aidl2.customization.CustomizationInfoParams; +import net.osmand.aidlapi.customization.SetWidgetsParams; +import net.osmand.aidlapi.customization.OsmandSettingsParams; +import net.osmand.aidlapi.customization.OsmandSettingsInfoParams; +import net.osmand.aidlapi.customization.CustomizationInfoParams; -import net.osmand.aidl2.gpx.AGpxFile; -import net.osmand.aidl2.gpx.AGpxFileDetails; -import net.osmand.aidl2.gpx.CreateGpxBitmapParams; -import net.osmand.aidl2.gpx.GpxColorParams; +import net.osmand.aidlapi.gpx.AGpxFile; +import net.osmand.aidlapi.gpx.AGpxFileDetails; +import net.osmand.aidlapi.gpx.CreateGpxBitmapParams; +import net.osmand.aidlapi.gpx.GpxColorParams; -import net.osmand.aidl2.tiles.ASqliteDbFile; +import net.osmand.aidlapi.tiles.ASqliteDbFile; -import net.osmand.aidl2.plugins.PluginParams; -import net.osmand.aidl2.copyfile.CopyFileParams; +import net.osmand.aidlapi.plugins.PluginParams; +import net.osmand.aidlapi.copyfile.CopyFileParams; -import net.osmand.aidl2.navigation.ANavigationUpdateParams; -import net.osmand.aidl2.navigation.ANavigationVoiceRouterMessageParams; +import net.osmand.aidlapi.navigation.ANavigationUpdateParams; +import net.osmand.aidlapi.navigation.ANavigationVoiceRouterMessageParams; -import net.osmand.aidl2.contextmenu.ContextMenuButtonsParams; -import net.osmand.aidl2.contextmenu.UpdateContextMenuButtonsParams; -import net.osmand.aidl2.contextmenu.RemoveContextMenuButtonsParams; +import net.osmand.aidlapi.contextmenu.ContextMenuButtonsParams; +import net.osmand.aidlapi.contextmenu.UpdateContextMenuButtonsParams; +import net.osmand.aidlapi.contextmenu.RemoveContextMenuButtonsParams; -import net.osmand.aidl2.mapmarker.RemoveMapMarkersParams; +import net.osmand.aidlapi.mapmarker.RemoveMapMarkersParams; // NOTE: Add new methods at the end of file!!! diff --git a/osmand-api/src/net/osmand/OsmAndCustomizationConstants.java b/osmand-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java similarity index 99% rename from osmand-api/src/net/osmand/OsmAndCustomizationConstants.java rename to osmand-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java index 08a58af326..6b8ca44bfe 100644 --- a/osmand-api/src/net/osmand/OsmAndCustomizationConstants.java +++ b/osmand-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java @@ -1,9 +1,8 @@ -package net.osmand; +package net.osmand.aidlapi; public interface OsmAndCustomizationConstants { // Navigation Drawer: - String DRAWER_ITEM_ID_SCHEME = "drawer.action."; String DRAWER_DASHBOARD_ID = DRAWER_ITEM_ID_SCHEME + "dashboard"; String DRAWER_MAP_MARKERS_ID = DRAWER_ITEM_ID_SCHEME + "map_markers"; @@ -23,7 +22,6 @@ public interface OsmAndCustomizationConstants { String DRAWER_DIVIDER_ID = DRAWER_ITEM_ID_SCHEME + "divider"; // Configure Map: - String CONFIGURE_MAP_ITEM_ID_SCHEME = "map.configure."; String SHOW_ITEMS_ID_SCHEME = CONFIGURE_MAP_ITEM_ID_SCHEME + "show."; String RENDERING_ITEMS_ID_SCHEME = CONFIGURE_MAP_ITEM_ID_SCHEME + "rendering."; @@ -60,7 +58,6 @@ public interface OsmAndCustomizationConstants { String ROUTES_ID = RENDERING_ITEMS_ID_SCHEME + "routes"; // Map Controls: - String HUD_BTN_ID_SCHEME = "map.view."; String LAYERS_HUD_ID = HUD_BTN_ID_SCHEME + "layers"; String COMPASS_HUD_ID = HUD_BTN_ID_SCHEME + "compass"; @@ -99,5 +96,4 @@ public interface OsmAndCustomizationConstants { String PLUGIN_RASTER_MAPS = "osmand.rastermaps"; String PLUGIN_SKI_MAPS = "skimaps.plugin"; String PLUGIN_SRTM = "osmand.srtm"; - -} +} \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidlapi/OsmandAidlConstants.java b/osmand-api/src/net/osmand/aidlapi/OsmandAidlConstants.java new file mode 100644 index 0000000000..5a39f25c09 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/OsmandAidlConstants.java @@ -0,0 +1,36 @@ +package net.osmand.aidlapi; + +public interface OsmandAidlConstants { + + int OK_RESPONSE = 0; + + int MIN_UPDATE_TIME_MS = 1000; + long COPY_FILE_PART_SIZE_LIMIT = 256 * 1024; + long COPY_FILE_MAX_LOCK_TIME_MS = 10000; + + int CANNOT_ACCESS_API_ERROR = -5; + int UNKNOWN_API_ERROR = -2; + + int MIN_UPDATE_TIME_MS_ERROR = -1; + + int COPY_FILE_PARAMS_ERROR = -1001; + int COPY_FILE_PART_SIZE_LIMIT_ERROR = -1002; + int COPY_FILE_WRITE_LOCK_ERROR = -1003; + int COPY_FILE_IO_ERROR = -1004; + int COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR = -1005; + + int TURN_TYPE_C = 1; //"C"; // continue (go straight) + int TURN_TYPE_TL = 2; // turn left + int TURN_TYPE_TSLL = 3; // turn slightly left + int TURN_TYPE_TSHL = 4; // turn sharply left + int TURN_TYPE_TR = 5; // turn right + int TURN_TYPE_TSLR = 6; // turn slightly right + int TURN_TYPE_TSHR = 7; // turn sharply right + int TURN_TYPE_KL = 8; // keep left + int TURN_TYPE_KR = 9; // keep right//$NON-NLS-1$ + int TURN_TYPE_TU = 10; // U-turn + int TURN_TYPE_TRU = 11; // Right U-turn + int TURN_TYPE_OFFR = 12; // Off route + int TURN_TYPE_RNDB = 13; // Roundabout + int TURN_TYPE_RNLB = 14; // Roundabout left +} \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidlapi/calculateroute/CalculateRouteParams.aidl b/osmand-api/src/net/osmand/aidlapi/calculateroute/CalculateRouteParams.aidl new file mode 100644 index 0000000000..4c695b9e9d --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/calculateroute/CalculateRouteParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.calculateroute; + +parcelable CalculateRouteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/calculateroute/CalculateRouteParams.java b/osmand-api/src/net/osmand/aidlapi/calculateroute/CalculateRouteParams.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/calculateroute/CalculateRouteParams.java rename to osmand-api/src/net/osmand/aidlapi/calculateroute/CalculateRouteParams.java index 6446ff958f..8a6d9ed4f3 100644 --- a/osmand-api/src/net/osmand/aidl2/calculateroute/CalculateRouteParams.java +++ b/osmand-api/src/net/osmand/aidlapi/calculateroute/CalculateRouteParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.calculateroute; +package net.osmand.aidlapi.calculateroute; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; -import net.osmand.aidl2.map.ALatLon; +import net.osmand.aidlapi.AidlParams; +import net.osmand.aidlapi.map.ALatLon; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidlapi/contextmenu/AContextMenuButton.aidl b/osmand-api/src/net/osmand/aidlapi/contextmenu/AContextMenuButton.aidl new file mode 100644 index 0000000000..0492a45d8d --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/contextmenu/AContextMenuButton.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.contextmenu; + +parcelable AContextMenuButton; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/contextmenu/AContextMenuButton.java b/osmand-api/src/net/osmand/aidlapi/contextmenu/AContextMenuButton.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/contextmenu/AContextMenuButton.java rename to osmand-api/src/net/osmand/aidlapi/contextmenu/AContextMenuButton.java index f8b554c015..38643e174f 100644 --- a/osmand-api/src/net/osmand/aidl2/contextmenu/AContextMenuButton.java +++ b/osmand-api/src/net/osmand/aidlapi/contextmenu/AContextMenuButton.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.contextmenu; +package net.osmand.aidlapi.contextmenu; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AContextMenuButton extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/contextmenu/ContextMenuButtonsParams.aidl b/osmand-api/src/net/osmand/aidlapi/contextmenu/ContextMenuButtonsParams.aidl new file mode 100644 index 0000000000..bfde3cfda7 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/contextmenu/ContextMenuButtonsParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.contextmenu; + +parcelable ContextMenuButtonsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/contextmenu/ContextMenuButtonsParams.java b/osmand-api/src/net/osmand/aidlapi/contextmenu/ContextMenuButtonsParams.java similarity index 97% rename from osmand-api/src/net/osmand/aidl2/contextmenu/ContextMenuButtonsParams.java rename to osmand-api/src/net/osmand/aidlapi/contextmenu/ContextMenuButtonsParams.java index 75b195a5cf..0d26f40f38 100644 --- a/osmand-api/src/net/osmand/aidl2/contextmenu/ContextMenuButtonsParams.java +++ b/osmand-api/src/net/osmand/aidlapi/contextmenu/ContextMenuButtonsParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.contextmenu; +package net.osmand.aidlapi.contextmenu; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidl2/contextmenu/RemoveContextMenuButtonsParams.aidl b/osmand-api/src/net/osmand/aidlapi/contextmenu/RemoveContextMenuButtonsParams.aidl similarity index 51% rename from osmand-api/src/net/osmand/aidl2/contextmenu/RemoveContextMenuButtonsParams.aidl rename to osmand-api/src/net/osmand/aidlapi/contextmenu/RemoveContextMenuButtonsParams.aidl index acbec273a3..0f13a9d455 100644 --- a/osmand-api/src/net/osmand/aidl2/contextmenu/RemoveContextMenuButtonsParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/contextmenu/RemoveContextMenuButtonsParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.contextmenu; +package net.osmand.aidlapi.contextmenu; parcelable RemoveContextMenuButtonsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/contextmenu/RemoveContextMenuButtonsParams.java b/osmand-api/src/net/osmand/aidlapi/contextmenu/RemoveContextMenuButtonsParams.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/contextmenu/RemoveContextMenuButtonsParams.java rename to osmand-api/src/net/osmand/aidlapi/contextmenu/RemoveContextMenuButtonsParams.java index c0a4f696f5..c0182211a5 100644 --- a/osmand-api/src/net/osmand/aidl2/contextmenu/RemoveContextMenuButtonsParams.java +++ b/osmand-api/src/net/osmand/aidlapi/contextmenu/RemoveContextMenuButtonsParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.contextmenu; +package net.osmand.aidlapi.contextmenu; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveContextMenuButtonsParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/contextmenu/UpdateContextMenuButtonsParams.aidl b/osmand-api/src/net/osmand/aidlapi/contextmenu/UpdateContextMenuButtonsParams.aidl similarity index 51% rename from osmand-api/src/net/osmand/aidl2/contextmenu/UpdateContextMenuButtonsParams.aidl rename to osmand-api/src/net/osmand/aidlapi/contextmenu/UpdateContextMenuButtonsParams.aidl index 14a9a40251..100d909c13 100644 --- a/osmand-api/src/net/osmand/aidl2/contextmenu/UpdateContextMenuButtonsParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/contextmenu/UpdateContextMenuButtonsParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.contextmenu; +package net.osmand.aidlapi.contextmenu; parcelable UpdateContextMenuButtonsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/contextmenu/UpdateContextMenuButtonsParams.java b/osmand-api/src/net/osmand/aidlapi/contextmenu/UpdateContextMenuButtonsParams.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/contextmenu/UpdateContextMenuButtonsParams.java rename to osmand-api/src/net/osmand/aidlapi/contextmenu/UpdateContextMenuButtonsParams.java index b4e209b18b..8bbef5eff0 100644 --- a/osmand-api/src/net/osmand/aidl2/contextmenu/UpdateContextMenuButtonsParams.java +++ b/osmand-api/src/net/osmand/aidlapi/contextmenu/UpdateContextMenuButtonsParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.contextmenu; +package net.osmand.aidlapi.contextmenu; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class UpdateContextMenuButtonsParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/copyfile/CopyFileParams.aidl b/osmand-api/src/net/osmand/aidlapi/copyfile/CopyFileParams.aidl new file mode 100644 index 0000000000..72f2e95d61 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/copyfile/CopyFileParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.copyfile; + +parcelable CopyFileParams; diff --git a/osmand-api/src/net/osmand/aidl2/copyfile/CopyFileParams.java b/osmand-api/src/net/osmand/aidlapi/copyfile/CopyFileParams.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/copyfile/CopyFileParams.java rename to osmand-api/src/net/osmand/aidlapi/copyfile/CopyFileParams.java index 4168560713..2b18172717 100644 --- a/osmand-api/src/net/osmand/aidl2/copyfile/CopyFileParams.java +++ b/osmand-api/src/net/osmand/aidlapi/copyfile/CopyFileParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.copyfile; +package net.osmand.aidlapi.copyfile; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class CopyFileParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/customization/CustomizationInfoParams.aidl b/osmand-api/src/net/osmand/aidlapi/customization/CustomizationInfoParams.aidl new file mode 100644 index 0000000000..b055e6d135 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/customization/CustomizationInfoParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.customization; + +parcelable CustomizationInfoParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/customization/CustomizationInfoParams.java b/osmand-api/src/net/osmand/aidlapi/customization/CustomizationInfoParams.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/customization/CustomizationInfoParams.java rename to osmand-api/src/net/osmand/aidlapi/customization/CustomizationInfoParams.java index bacbfc0542..ea5ef81771 100644 --- a/osmand-api/src/net/osmand/aidl2/customization/CustomizationInfoParams.java +++ b/osmand-api/src/net/osmand/aidlapi/customization/CustomizationInfoParams.java @@ -1,13 +1,13 @@ -package net.osmand.aidl2.customization; +package net.osmand.aidlapi.customization; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; -import net.osmand.aidl2.navdrawer.NavDrawerFooterParams; -import net.osmand.aidl2.navdrawer.NavDrawerHeaderParams; -import net.osmand.aidl2.navdrawer.SetNavDrawerItemsParams; -import net.osmand.aidl2.plugins.PluginParams; +import net.osmand.aidlapi.AidlParams; +import net.osmand.aidlapi.navdrawer.NavDrawerFooterParams; +import net.osmand.aidlapi.navdrawer.NavDrawerHeaderParams; +import net.osmand.aidlapi.navdrawer.SetNavDrawerItemsParams; +import net.osmand.aidlapi.plugins.PluginParams; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsInfoParams.aidl b/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsInfoParams.aidl new file mode 100644 index 0000000000..261a2c96ea --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsInfoParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.customization; + +parcelable OsmandSettingsInfoParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsInfoParams.java b/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsInfoParams.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsInfoParams.java rename to osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsInfoParams.java index 6eb25ae4ef..c7cf7e16c5 100644 --- a/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsInfoParams.java +++ b/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsInfoParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.customization; +package net.osmand.aidlapi.customization; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class OsmandSettingsInfoParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsParams.aidl b/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsParams.aidl new file mode 100644 index 0000000000..859fc34ada --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.customization; + +parcelable OsmandSettingsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsParams.java b/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsParams.java rename to osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsParams.java index 08c53f1423..dead6bbd2f 100644 --- a/osmand-api/src/net/osmand/aidl2/customization/OsmandSettingsParams.java +++ b/osmand-api/src/net/osmand/aidlapi/customization/OsmandSettingsParams.java @@ -1,11 +1,11 @@ -package net.osmand.aidl2.customization; +package net.osmand.aidlapi.customization; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class OsmandSettingsParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/customization/SetWidgetsParams.aidl b/osmand-api/src/net/osmand/aidlapi/customization/SetWidgetsParams.aidl new file mode 100644 index 0000000000..6b6c47cfe2 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/customization/SetWidgetsParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.customization; + +parcelable SetWidgetsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/customization/SetWidgetsParams.java b/osmand-api/src/net/osmand/aidlapi/customization/SetWidgetsParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/customization/SetWidgetsParams.java rename to osmand-api/src/net/osmand/aidlapi/customization/SetWidgetsParams.java index d8a8c4fe3e..ed9755710a 100644 --- a/osmand-api/src/net/osmand/aidl2/customization/SetWidgetsParams.java +++ b/osmand-api/src/net/osmand/aidlapi/customization/SetWidgetsParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.customization; +package net.osmand.aidlapi.customization; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.Nullable; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidlapi/favorite/AFavorite.aidl b/osmand-api/src/net/osmand/aidlapi/favorite/AFavorite.aidl new file mode 100644 index 0000000000..9a3605a28e --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/favorite/AFavorite.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.favorite; + +parcelable AFavorite; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/AFavorite.java b/osmand-api/src/net/osmand/aidlapi/favorite/AFavorite.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/favorite/AFavorite.java rename to osmand-api/src/net/osmand/aidlapi/favorite/AFavorite.java index 344f572459..1e645d2fae 100644 --- a/osmand-api/src/net/osmand/aidl2/favorite/AFavorite.java +++ b/osmand-api/src/net/osmand/aidlapi/favorite/AFavorite.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.favorite; +package net.osmand.aidlapi.favorite; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AFavorite extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/favorite/AddFavoriteParams.aidl b/osmand-api/src/net/osmand/aidlapi/favorite/AddFavoriteParams.aidl new file mode 100644 index 0000000000..07c0b0da86 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/favorite/AddFavoriteParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.favorite; + +parcelable AddFavoriteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/AddFavoriteParams.java b/osmand-api/src/net/osmand/aidlapi/favorite/AddFavoriteParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/favorite/AddFavoriteParams.java rename to osmand-api/src/net/osmand/aidlapi/favorite/AddFavoriteParams.java index 384d38f1aa..40545fe43d 100644 --- a/osmand-api/src/net/osmand/aidl2/favorite/AddFavoriteParams.java +++ b/osmand-api/src/net/osmand/aidlapi/favorite/AddFavoriteParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.favorite; +package net.osmand.aidlapi.favorite; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AddFavoriteParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/favorite/RemoveFavoriteParams.aidl b/osmand-api/src/net/osmand/aidlapi/favorite/RemoveFavoriteParams.aidl new file mode 100644 index 0000000000..a6896b1645 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/favorite/RemoveFavoriteParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.favorite; + +parcelable RemoveFavoriteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/RemoveFavoriteParams.java b/osmand-api/src/net/osmand/aidlapi/favorite/RemoveFavoriteParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/favorite/RemoveFavoriteParams.java rename to osmand-api/src/net/osmand/aidlapi/favorite/RemoveFavoriteParams.java index 8cf649e1ca..9144d2ba38 100644 --- a/osmand-api/src/net/osmand/aidl2/favorite/RemoveFavoriteParams.java +++ b/osmand-api/src/net/osmand/aidlapi/favorite/RemoveFavoriteParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.favorite; +package net.osmand.aidlapi.favorite; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveFavoriteParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/favorite/UpdateFavoriteParams.aidl b/osmand-api/src/net/osmand/aidlapi/favorite/UpdateFavoriteParams.aidl new file mode 100644 index 0000000000..8b2438dc65 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/favorite/UpdateFavoriteParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.favorite; + +parcelable UpdateFavoriteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/UpdateFavoriteParams.java b/osmand-api/src/net/osmand/aidlapi/favorite/UpdateFavoriteParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/favorite/UpdateFavoriteParams.java rename to osmand-api/src/net/osmand/aidlapi/favorite/UpdateFavoriteParams.java index d9f515e695..0d2d226a4b 100644 --- a/osmand-api/src/net/osmand/aidl2/favorite/UpdateFavoriteParams.java +++ b/osmand-api/src/net/osmand/aidlapi/favorite/UpdateFavoriteParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.favorite; +package net.osmand.aidlapi.favorite; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class UpdateFavoriteParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/favorite/group/AFavoriteGroup.aidl b/osmand-api/src/net/osmand/aidlapi/favorite/group/AFavoriteGroup.aidl new file mode 100644 index 0000000000..6c687297f1 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/favorite/group/AFavoriteGroup.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.favorite.group; + +parcelable AFavoriteGroup; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/group/AFavoriteGroup.java b/osmand-api/src/net/osmand/aidlapi/favorite/group/AFavoriteGroup.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/favorite/group/AFavoriteGroup.java rename to osmand-api/src/net/osmand/aidlapi/favorite/group/AFavoriteGroup.java index 677b10b912..3f04ab5ebc 100644 --- a/osmand-api/src/net/osmand/aidl2/favorite/group/AFavoriteGroup.java +++ b/osmand-api/src/net/osmand/aidlapi/favorite/group/AFavoriteGroup.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.favorite.group; +package net.osmand.aidlapi.favorite.group; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AFavoriteGroup extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/favorite/group/AddFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidlapi/favorite/group/AddFavoriteGroupParams.aidl new file mode 100644 index 0000000000..4d10ed6cb0 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/favorite/group/AddFavoriteGroupParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.favorite.group; + +parcelable AddFavoriteGroupParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/group/AddFavoriteGroupParams.java b/osmand-api/src/net/osmand/aidlapi/favorite/group/AddFavoriteGroupParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/favorite/group/AddFavoriteGroupParams.java rename to osmand-api/src/net/osmand/aidlapi/favorite/group/AddFavoriteGroupParams.java index dee4d87185..232c0862a1 100644 --- a/osmand-api/src/net/osmand/aidl2/favorite/group/AddFavoriteGroupParams.java +++ b/osmand-api/src/net/osmand/aidlapi/favorite/group/AddFavoriteGroupParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.favorite.group; +package net.osmand.aidlapi.favorite.group; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AddFavoriteGroupParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/favorite/group/RemoveFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidlapi/favorite/group/RemoveFavoriteGroupParams.aidl new file mode 100644 index 0000000000..855f344776 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/favorite/group/RemoveFavoriteGroupParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.favorite.group; + +parcelable RemoveFavoriteGroupParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/group/RemoveFavoriteGroupParams.java b/osmand-api/src/net/osmand/aidlapi/favorite/group/RemoveFavoriteGroupParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/favorite/group/RemoveFavoriteGroupParams.java rename to osmand-api/src/net/osmand/aidlapi/favorite/group/RemoveFavoriteGroupParams.java index 033706ebe9..3f2716823c 100644 --- a/osmand-api/src/net/osmand/aidl2/favorite/group/RemoveFavoriteGroupParams.java +++ b/osmand-api/src/net/osmand/aidlapi/favorite/group/RemoveFavoriteGroupParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.favorite.group; +package net.osmand.aidlapi.favorite.group; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveFavoriteGroupParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/favorite/group/UpdateFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidlapi/favorite/group/UpdateFavoriteGroupParams.aidl new file mode 100644 index 0000000000..b7b46bf6ca --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/favorite/group/UpdateFavoriteGroupParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.favorite.group; + +parcelable UpdateFavoriteGroupParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/favorite/group/UpdateFavoriteGroupParams.java b/osmand-api/src/net/osmand/aidlapi/favorite/group/UpdateFavoriteGroupParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/favorite/group/UpdateFavoriteGroupParams.java rename to osmand-api/src/net/osmand/aidlapi/favorite/group/UpdateFavoriteGroupParams.java index adba31107b..cab176560b 100644 --- a/osmand-api/src/net/osmand/aidl2/favorite/group/UpdateFavoriteGroupParams.java +++ b/osmand-api/src/net/osmand/aidlapi/favorite/group/UpdateFavoriteGroupParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.favorite.group; +package net.osmand.aidlapi.favorite.group; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class UpdateFavoriteGroupParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/AGpxBitmap.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxBitmap.aidl new file mode 100644 index 0000000000..abbc03669c --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxBitmap.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable AGpxBitmap; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/AGpxBitmap.java b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxBitmap.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/gpx/AGpxBitmap.java rename to osmand-api/src/net/osmand/aidlapi/gpx/AGpxBitmap.java index 7191ec64df..6ba3f8ea4b 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/AGpxBitmap.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxBitmap.java @@ -1,11 +1,11 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.graphics.Bitmap; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AGpxBitmap extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFile.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFile.aidl new file mode 100644 index 0000000000..4027c70c66 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFile.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable AGpxFile; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/AGpxFile.java b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFile.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/gpx/AGpxFile.java rename to osmand-api/src/net/osmand/aidlapi/gpx/AGpxFile.java index 86adea8394..acbc671456 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/AGpxFile.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFile.java @@ -1,11 +1,11 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AGpxFile extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFileDetails.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFileDetails.aidl new file mode 100644 index 0000000000..278dae038d --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFileDetails.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable AGpxFileDetails; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/AGpxFileDetails.java b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFileDetails.java similarity index 98% rename from osmand-api/src/net/osmand/aidl2/gpx/AGpxFileDetails.java rename to osmand-api/src/net/osmand/aidlapi/gpx/AGpxFileDetails.java index 45f81ee41d..1c2cbe2130 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/AGpxFileDetails.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/AGpxFileDetails.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/ASelectedGpxFile.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/ASelectedGpxFile.aidl new file mode 100644 index 0000000000..57568e7249 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/ASelectedGpxFile.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable ASelectedGpxFile; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/ASelectedGpxFile.java b/osmand-api/src/net/osmand/aidlapi/gpx/ASelectedGpxFile.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/gpx/ASelectedGpxFile.java rename to osmand-api/src/net/osmand/aidlapi/gpx/ASelectedGpxFile.java index e28d6dafe5..fc7e60cedb 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/ASelectedGpxFile.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/ASelectedGpxFile.java @@ -1,11 +1,11 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ASelectedGpxFile extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/gpx/CreateGpxBitmapParams.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/CreateGpxBitmapParams.aidl similarity index 51% rename from osmand-api/src/net/osmand/aidl2/gpx/CreateGpxBitmapParams.aidl rename to osmand-api/src/net/osmand/aidlapi/gpx/CreateGpxBitmapParams.aidl index 776f455eb4..afbc7a812f 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/CreateGpxBitmapParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/gpx/CreateGpxBitmapParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; parcelable CreateGpxBitmapParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/CreateGpxBitmapParams.java b/osmand-api/src/net/osmand/aidlapi/gpx/CreateGpxBitmapParams.java similarity index 97% rename from osmand-api/src/net/osmand/aidl2/gpx/CreateGpxBitmapParams.java rename to osmand-api/src/net/osmand/aidlapi/gpx/CreateGpxBitmapParams.java index 4e3d6ccfe1..8287e8915f 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/CreateGpxBitmapParams.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/CreateGpxBitmapParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.net.Uri; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; import java.io.File; diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/GpxColorParams.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/GpxColorParams.aidl new file mode 100644 index 0000000000..6573d502a3 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/GpxColorParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable GpxColorParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/GpxColorParams.java b/osmand-api/src/net/osmand/aidlapi/gpx/GpxColorParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/gpx/GpxColorParams.java rename to osmand-api/src/net/osmand/aidlapi/gpx/GpxColorParams.java index 516f6d9a0e..24ee56f85a 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/GpxColorParams.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/GpxColorParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class GpxColorParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/HideGpxParams.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/HideGpxParams.aidl new file mode 100644 index 0000000000..ea355895bb --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/HideGpxParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable HideGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/HideGpxParams.java b/osmand-api/src/net/osmand/aidlapi/gpx/HideGpxParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/gpx/HideGpxParams.java rename to osmand-api/src/net/osmand/aidlapi/gpx/HideGpxParams.java index 3f8df40f9f..9f1f3d1897 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/HideGpxParams.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/HideGpxParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class HideGpxParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/ImportGpxParams.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/ImportGpxParams.aidl new file mode 100644 index 0000000000..3b0f455708 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/ImportGpxParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable ImportGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/ImportGpxParams.java b/osmand-api/src/net/osmand/aidlapi/gpx/ImportGpxParams.java similarity index 97% rename from osmand-api/src/net/osmand/aidl2/gpx/ImportGpxParams.java rename to osmand-api/src/net/osmand/aidlapi/gpx/ImportGpxParams.java index 9c67fa779e..603b95e468 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/ImportGpxParams.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/ImportGpxParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.net.Uri; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; import java.io.File; diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/RemoveGpxParams.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/RemoveGpxParams.aidl new file mode 100644 index 0000000000..d061759842 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/RemoveGpxParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable RemoveGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/RemoveGpxParams.java b/osmand-api/src/net/osmand/aidlapi/gpx/RemoveGpxParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/gpx/RemoveGpxParams.java rename to osmand-api/src/net/osmand/aidlapi/gpx/RemoveGpxParams.java index c46936edbc..bb45e67cfe 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/RemoveGpxParams.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/RemoveGpxParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveGpxParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/gpx/ShowGpxParams.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/ShowGpxParams.aidl new file mode 100644 index 0000000000..946c43a744 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/gpx/ShowGpxParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.gpx; + +parcelable ShowGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/ShowGpxParams.java b/osmand-api/src/net/osmand/aidlapi/gpx/ShowGpxParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/gpx/ShowGpxParams.java rename to osmand-api/src/net/osmand/aidlapi/gpx/ShowGpxParams.java index 9a2ea7f677..3162895999 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/ShowGpxParams.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/ShowGpxParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ShowGpxParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/gpx/StartGpxRecordingParams.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/StartGpxRecordingParams.aidl similarity index 52% rename from osmand-api/src/net/osmand/aidl2/gpx/StartGpxRecordingParams.aidl rename to osmand-api/src/net/osmand/aidlapi/gpx/StartGpxRecordingParams.aidl index 45be7e9186..2d5462de95 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/StartGpxRecordingParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/gpx/StartGpxRecordingParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; parcelable StartGpxRecordingParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/StartGpxRecordingParams.java b/osmand-api/src/net/osmand/aidlapi/gpx/StartGpxRecordingParams.java similarity index 88% rename from osmand-api/src/net/osmand/aidl2/gpx/StartGpxRecordingParams.java rename to osmand-api/src/net/osmand/aidlapi/gpx/StartGpxRecordingParams.java index b829302e25..e66e9e368d 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/StartGpxRecordingParams.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/StartGpxRecordingParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class StartGpxRecordingParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/gpx/StopGpxRecordingParams.aidl b/osmand-api/src/net/osmand/aidlapi/gpx/StopGpxRecordingParams.aidl similarity index 52% rename from osmand-api/src/net/osmand/aidl2/gpx/StopGpxRecordingParams.aidl rename to osmand-api/src/net/osmand/aidlapi/gpx/StopGpxRecordingParams.aidl index 291d013cbd..8f92254f02 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/StopGpxRecordingParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/gpx/StopGpxRecordingParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; parcelable StopGpxRecordingParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/gpx/StopGpxRecordingParams.java b/osmand-api/src/net/osmand/aidlapi/gpx/StopGpxRecordingParams.java similarity index 88% rename from osmand-api/src/net/osmand/aidl2/gpx/StopGpxRecordingParams.java rename to osmand-api/src/net/osmand/aidlapi/gpx/StopGpxRecordingParams.java index dca59579a5..7248d3ffdc 100644 --- a/osmand-api/src/net/osmand/aidl2/gpx/StopGpxRecordingParams.java +++ b/osmand-api/src/net/osmand/aidlapi/gpx/StopGpxRecordingParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.gpx; +package net.osmand.aidlapi.gpx; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class StopGpxRecordingParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/map/ALatLon.aidl b/osmand-api/src/net/osmand/aidlapi/map/ALatLon.aidl new file mode 100644 index 0000000000..c41d173bb5 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/map/ALatLon.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.map; + +parcelable ALatLon; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/map/ALatLon.java b/osmand-api/src/net/osmand/aidlapi/map/ALatLon.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/map/ALatLon.java rename to osmand-api/src/net/osmand/aidlapi/map/ALatLon.java index 03ce65a058..0ba9ee8cbd 100644 --- a/osmand-api/src/net/osmand/aidl2/map/ALatLon.java +++ b/osmand-api/src/net/osmand/aidlapi/map/ALatLon.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.map; +package net.osmand.aidlapi.map; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ALatLon extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/map/SetMapLocationParams.aidl b/osmand-api/src/net/osmand/aidlapi/map/SetMapLocationParams.aidl similarity index 50% rename from osmand-api/src/net/osmand/aidl2/map/SetMapLocationParams.aidl rename to osmand-api/src/net/osmand/aidlapi/map/SetMapLocationParams.aidl index baf7366a3d..715d68eb5c 100644 --- a/osmand-api/src/net/osmand/aidl2/map/SetMapLocationParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/map/SetMapLocationParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.map; +package net.osmand.aidlapi.map; parcelable SetMapLocationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/map/SetMapLocationParams.java b/osmand-api/src/net/osmand/aidlapi/map/SetMapLocationParams.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/map/SetMapLocationParams.java rename to osmand-api/src/net/osmand/aidlapi/map/SetMapLocationParams.java index 1e2c0b59e0..9da5ee83f0 100644 --- a/osmand-api/src/net/osmand/aidl2/map/SetMapLocationParams.java +++ b/osmand-api/src/net/osmand/aidlapi/map/SetMapLocationParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.map; +package net.osmand.aidlapi.map; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class SetMapLocationParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/AMapLayer.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/AMapLayer.aidl new file mode 100644 index 0000000000..01e745862a --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/AMapLayer.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer; + +parcelable AMapLayer; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/AMapLayer.java b/osmand-api/src/net/osmand/aidlapi/maplayer/AMapLayer.java similarity index 97% rename from osmand-api/src/net/osmand/aidl2/maplayer/AMapLayer.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/AMapLayer.java index 783920f140..72d6a925c6 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/AMapLayer.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/AMapLayer.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.maplayer; +package net.osmand.aidlapi.maplayer; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; -import net.osmand.aidl2.maplayer.point.AMapPoint; +import net.osmand.aidlapi.AidlParams; +import net.osmand.aidlapi.maplayer.point.AMapPoint; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/AddMapLayerParams.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/AddMapLayerParams.aidl new file mode 100644 index 0000000000..fe3a15d72a --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/AddMapLayerParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer; + +parcelable AddMapLayerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/AddMapLayerParams.java b/osmand-api/src/net/osmand/aidlapi/maplayer/AddMapLayerParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/maplayer/AddMapLayerParams.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/AddMapLayerParams.java index 273a71b064..7cd52748e1 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/AddMapLayerParams.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/AddMapLayerParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.maplayer; +package net.osmand.aidlapi.maplayer; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AddMapLayerParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/RemoveMapLayerParams.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/RemoveMapLayerParams.aidl new file mode 100644 index 0000000000..0c88fdf48b --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/RemoveMapLayerParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer; + +parcelable RemoveMapLayerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/RemoveMapLayerParams.java b/osmand-api/src/net/osmand/aidlapi/maplayer/RemoveMapLayerParams.java similarity index 91% rename from osmand-api/src/net/osmand/aidl2/maplayer/RemoveMapLayerParams.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/RemoveMapLayerParams.java index 802459da9e..b778a49fcc 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/RemoveMapLayerParams.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/RemoveMapLayerParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.maplayer; +package net.osmand.aidlapi.maplayer; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveMapLayerParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/UpdateMapLayerParams.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/UpdateMapLayerParams.aidl new file mode 100644 index 0000000000..632739ec29 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/UpdateMapLayerParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer; + +parcelable UpdateMapLayerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/UpdateMapLayerParams.java b/osmand-api/src/net/osmand/aidlapi/maplayer/UpdateMapLayerParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/maplayer/UpdateMapLayerParams.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/UpdateMapLayerParams.java index 08e4964966..d32c2aed83 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/UpdateMapLayerParams.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/UpdateMapLayerParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.maplayer; +package net.osmand.aidlapi.maplayer; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class UpdateMapLayerParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/point/AMapPoint.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/point/AMapPoint.aidl new file mode 100644 index 0000000000..a00221d142 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/AMapPoint.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer.point; + +parcelable AMapPoint; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/AMapPoint.java b/osmand-api/src/net/osmand/aidlapi/maplayer/point/AMapPoint.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/maplayer/point/AMapPoint.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/point/AMapPoint.java index 0cd5843389..8b63c6ec55 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/AMapPoint.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/AMapPoint.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.maplayer.point; +package net.osmand.aidlapi.maplayer.point; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; -import net.osmand.aidl2.map.ALatLon; +import net.osmand.aidlapi.AidlParams; +import net.osmand.aidlapi.map.ALatLon; import java.util.ArrayList; import java.util.HashMap; diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/point/AddMapPointParams.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/point/AddMapPointParams.aidl new file mode 100644 index 0000000000..9d4d5d1ae0 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/AddMapPointParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer.point; + +parcelable AddMapPointParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/AddMapPointParams.java b/osmand-api/src/net/osmand/aidlapi/maplayer/point/AddMapPointParams.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/maplayer/point/AddMapPointParams.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/point/AddMapPointParams.java index c2fa51b86d..5e4c8177df 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/AddMapPointParams.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/AddMapPointParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.maplayer.point; +package net.osmand.aidlapi.maplayer.point; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AddMapPointParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/point/RemoveMapPointParams.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/point/RemoveMapPointParams.aidl new file mode 100644 index 0000000000..7e346391ec --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/RemoveMapPointParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer.point; + +parcelable RemoveMapPointParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/RemoveMapPointParams.java b/osmand-api/src/net/osmand/aidlapi/maplayer/point/RemoveMapPointParams.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/maplayer/point/RemoveMapPointParams.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/point/RemoveMapPointParams.java index 2ea08e45df..620c13bc10 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/RemoveMapPointParams.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/RemoveMapPointParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.maplayer.point; +package net.osmand.aidlapi.maplayer.point; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveMapPointParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/point/ShowMapPointParams.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/point/ShowMapPointParams.aidl new file mode 100644 index 0000000000..a4f1591dc9 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/ShowMapPointParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer.point; + +parcelable ShowMapPointParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/ShowMapPointParams.java b/osmand-api/src/net/osmand/aidlapi/maplayer/point/ShowMapPointParams.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/maplayer/point/ShowMapPointParams.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/point/ShowMapPointParams.java index 215c7e7e25..08be287088 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/ShowMapPointParams.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/ShowMapPointParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.maplayer.point; +package net.osmand.aidlapi.maplayer.point; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ShowMapPointParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/maplayer/point/UpdateMapPointParams.aidl b/osmand-api/src/net/osmand/aidlapi/maplayer/point/UpdateMapPointParams.aidl new file mode 100644 index 0000000000..e4f80785da --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/UpdateMapPointParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.maplayer.point; + +parcelable UpdateMapPointParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/maplayer/point/UpdateMapPointParams.java b/osmand-api/src/net/osmand/aidlapi/maplayer/point/UpdateMapPointParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/maplayer/point/UpdateMapPointParams.java rename to osmand-api/src/net/osmand/aidlapi/maplayer/point/UpdateMapPointParams.java index 552b54ce79..77f85e180f 100644 --- a/osmand-api/src/net/osmand/aidl2/maplayer/point/UpdateMapPointParams.java +++ b/osmand-api/src/net/osmand/aidlapi/maplayer/point/UpdateMapPointParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.maplayer.point; +package net.osmand.aidlapi.maplayer.point; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class UpdateMapPointParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/mapmarker/AMapMarker.aidl b/osmand-api/src/net/osmand/aidlapi/mapmarker/AMapMarker.aidl new file mode 100644 index 0000000000..26de4179b1 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/AMapMarker.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapmarker; + +parcelable AMapMarker; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/AMapMarker.java b/osmand-api/src/net/osmand/aidlapi/mapmarker/AMapMarker.java similarity index 90% rename from osmand-api/src/net/osmand/aidl2/mapmarker/AMapMarker.java rename to osmand-api/src/net/osmand/aidlapi/mapmarker/AMapMarker.java index a5c6c86aa9..5424d95145 100644 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/AMapMarker.java +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/AMapMarker.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.mapmarker; +package net.osmand.aidlapi.mapmarker; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; -import net.osmand.aidl2.map.ALatLon; +import net.osmand.aidlapi.AidlParams; +import net.osmand.aidlapi.map.ALatLon; public class AMapMarker extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/mapmarker/AddMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidlapi/mapmarker/AddMapMarkerParams.aidl new file mode 100644 index 0000000000..7dd95ebf94 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/AddMapMarkerParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapmarker; + +parcelable AddMapMarkerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/AddMapMarkerParams.java b/osmand-api/src/net/osmand/aidlapi/mapmarker/AddMapMarkerParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/mapmarker/AddMapMarkerParams.java rename to osmand-api/src/net/osmand/aidlapi/mapmarker/AddMapMarkerParams.java index ab56f6a3ae..25bd529929 100644 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/AddMapMarkerParams.java +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/AddMapMarkerParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.mapmarker; +package net.osmand.aidlapi.mapmarker; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AddMapMarkerParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkerParams.aidl new file mode 100644 index 0000000000..174bffb9b4 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkerParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapmarker; + +parcelable RemoveMapMarkerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkerParams.java b/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkerParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkerParams.java rename to osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkerParams.java index afd363320b..6c8db4fdb2 100644 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkerParams.java +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkerParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.mapmarker; +package net.osmand.aidlapi.mapmarker; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveMapMarkerParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkersParams.aidl b/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkersParams.aidl new file mode 100644 index 0000000000..abcaadd543 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkersParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapmarker; + +parcelable RemoveMapMarkersParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkersParams.java b/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkersParams.java similarity index 87% rename from osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkersParams.java rename to osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkersParams.java index b23fabf632..d47d9f202c 100644 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/RemoveMapMarkersParams.java +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/RemoveMapMarkersParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.mapmarker; +package net.osmand.aidlapi.mapmarker; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveMapMarkersParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/mapmarker/UpdateMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidlapi/mapmarker/UpdateMapMarkerParams.aidl new file mode 100644 index 0000000000..99f3f97674 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/UpdateMapMarkerParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapmarker; + +parcelable UpdateMapMarkerParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapmarker/UpdateMapMarkerParams.java b/osmand-api/src/net/osmand/aidlapi/mapmarker/UpdateMapMarkerParams.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/mapmarker/UpdateMapMarkerParams.java rename to osmand-api/src/net/osmand/aidlapi/mapmarker/UpdateMapMarkerParams.java index 3670c24f63..6324b33365 100644 --- a/osmand-api/src/net/osmand/aidl2/mapmarker/UpdateMapMarkerParams.java +++ b/osmand-api/src/net/osmand/aidlapi/mapmarker/UpdateMapMarkerParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.mapmarker; +package net.osmand.aidlapi.mapmarker; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class UpdateMapMarkerParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/mapwidget/AMapWidget.aidl b/osmand-api/src/net/osmand/aidlapi/mapwidget/AMapWidget.aidl new file mode 100644 index 0000000000..30d13e158a --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapwidget/AMapWidget.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapwidget; + +parcelable AMapWidget; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapwidget/AMapWidget.java b/osmand-api/src/net/osmand/aidlapi/mapwidget/AMapWidget.java similarity index 97% rename from osmand-api/src/net/osmand/aidl2/mapwidget/AMapWidget.java rename to osmand-api/src/net/osmand/aidlapi/mapwidget/AMapWidget.java index 82b1f7befb..8ff1debe9b 100644 --- a/osmand-api/src/net/osmand/aidl2/mapwidget/AMapWidget.java +++ b/osmand-api/src/net/osmand/aidlapi/mapwidget/AMapWidget.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.mapwidget; +package net.osmand.aidlapi.mapwidget; import android.content.Intent; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AMapWidget extends AidlParams { private String id; diff --git a/osmand-api/src/net/osmand/aidlapi/mapwidget/AddMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidlapi/mapwidget/AddMapWidgetParams.aidl new file mode 100644 index 0000000000..6759bef32e --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapwidget/AddMapWidgetParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapwidget; + +parcelable AddMapWidgetParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapwidget/AddMapWidgetParams.java b/osmand-api/src/net/osmand/aidlapi/mapwidget/AddMapWidgetParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/mapwidget/AddMapWidgetParams.java rename to osmand-api/src/net/osmand/aidlapi/mapwidget/AddMapWidgetParams.java index ee387af8e0..fc039c05e4 100644 --- a/osmand-api/src/net/osmand/aidl2/mapwidget/AddMapWidgetParams.java +++ b/osmand-api/src/net/osmand/aidlapi/mapwidget/AddMapWidgetParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.mapwidget; +package net.osmand.aidlapi.mapwidget; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class AddMapWidgetParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/mapwidget/RemoveMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidlapi/mapwidget/RemoveMapWidgetParams.aidl new file mode 100644 index 0000000000..8801dad3f5 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapwidget/RemoveMapWidgetParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapwidget; + +parcelable RemoveMapWidgetParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapwidget/RemoveMapWidgetParams.java b/osmand-api/src/net/osmand/aidlapi/mapwidget/RemoveMapWidgetParams.java similarity index 91% rename from osmand-api/src/net/osmand/aidl2/mapwidget/RemoveMapWidgetParams.java rename to osmand-api/src/net/osmand/aidlapi/mapwidget/RemoveMapWidgetParams.java index 17bbe3ddcf..adbc6fc48d 100644 --- a/osmand-api/src/net/osmand/aidl2/mapwidget/RemoveMapWidgetParams.java +++ b/osmand-api/src/net/osmand/aidlapi/mapwidget/RemoveMapWidgetParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.mapwidget; +package net.osmand.aidlapi.mapwidget; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class RemoveMapWidgetParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/mapwidget/UpdateMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidlapi/mapwidget/UpdateMapWidgetParams.aidl new file mode 100644 index 0000000000..bce32c0668 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/mapwidget/UpdateMapWidgetParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.mapwidget; + +parcelable UpdateMapWidgetParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/mapwidget/UpdateMapWidgetParams.java b/osmand-api/src/net/osmand/aidlapi/mapwidget/UpdateMapWidgetParams.java similarity index 92% rename from osmand-api/src/net/osmand/aidl2/mapwidget/UpdateMapWidgetParams.java rename to osmand-api/src/net/osmand/aidlapi/mapwidget/UpdateMapWidgetParams.java index 0ca2fdd499..7e6166b54a 100644 --- a/osmand-api/src/net/osmand/aidl2/mapwidget/UpdateMapWidgetParams.java +++ b/osmand-api/src/net/osmand/aidlapi/mapwidget/UpdateMapWidgetParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.mapwidget; +package net.osmand.aidlapi.mapwidget; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class UpdateMapWidgetParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerFooterParams.aidl b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerFooterParams.aidl new file mode 100644 index 0000000000..47948ad135 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerFooterParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navdrawer; + +parcelable NavDrawerFooterParams; diff --git a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerFooterParams.java b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerFooterParams.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerFooterParams.java rename to osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerFooterParams.java index fc59230bfb..667016c5e0 100644 --- a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerFooterParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerFooterParams.java @@ -1,11 +1,11 @@ -package net.osmand.aidl2.navdrawer; +package net.osmand.aidlapi.navdrawer; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class NavDrawerFooterParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerHeaderParams.aidl b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerHeaderParams.aidl new file mode 100644 index 0000000000..2a39fdd31f --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerHeaderParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navdrawer; + +parcelable NavDrawerHeaderParams; diff --git a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerHeaderParams.java b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerHeaderParams.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerHeaderParams.java rename to osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerHeaderParams.java index 61b1a15cfe..3ea2d45eaf 100644 --- a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerHeaderParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerHeaderParams.java @@ -1,11 +1,11 @@ -package net.osmand.aidl2.navdrawer; +package net.osmand.aidlapi.navdrawer; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class NavDrawerHeaderParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerItem.aidl b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerItem.aidl new file mode 100644 index 0000000000..a4c9a72089 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerItem.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navdrawer; + +parcelable NavDrawerItem; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerItem.java b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerItem.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerItem.java rename to osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerItem.java index 7a393a4da0..e865a540f8 100644 --- a/osmand-api/src/net/osmand/aidl2/navdrawer/NavDrawerItem.java +++ b/osmand-api/src/net/osmand/aidlapi/navdrawer/NavDrawerItem.java @@ -1,11 +1,11 @@ -package net.osmand.aidl2.navdrawer; +package net.osmand.aidlapi.navdrawer; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class NavDrawerItem extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navdrawer/SetNavDrawerItemsParams.aidl b/osmand-api/src/net/osmand/aidlapi/navdrawer/SetNavDrawerItemsParams.aidl new file mode 100644 index 0000000000..f92a0fb10b --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navdrawer/SetNavDrawerItemsParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navdrawer; + +parcelable SetNavDrawerItemsParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navdrawer/SetNavDrawerItemsParams.java b/osmand-api/src/net/osmand/aidlapi/navdrawer/SetNavDrawerItemsParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/navdrawer/SetNavDrawerItemsParams.java rename to osmand-api/src/net/osmand/aidlapi/navdrawer/SetNavDrawerItemsParams.java index adf69bd10a..9609b558ae 100644 --- a/osmand-api/src/net/osmand/aidl2/navdrawer/SetNavDrawerItemsParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navdrawer/SetNavDrawerItemsParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.navdrawer; +package net.osmand.aidlapi.navdrawer; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/ADirectionInfo.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/ADirectionInfo.aidl new file mode 100644 index 0000000000..19d7a7e5f1 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/ADirectionInfo.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable ADirectionInfo; diff --git a/osmand-api/src/net/osmand/aidl2/navigation/ADirectionInfo.java b/osmand-api/src/net/osmand/aidlapi/navigation/ADirectionInfo.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/navigation/ADirectionInfo.java rename to osmand-api/src/net/osmand/aidlapi/navigation/ADirectionInfo.java index 3c128ee399..91c59dfb29 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/ADirectionInfo.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/ADirectionInfo.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ADirectionInfo extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationUpdateParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationUpdateParams.aidl new file mode 100644 index 0000000000..ccdbc4b4ab --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationUpdateParams.aidl @@ -0,0 +1,4 @@ + +package net.osmand.aidlapi.navigation; + +parcelable ANavigationUpdateParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/ANavigationUpdateParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationUpdateParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/navigation/ANavigationUpdateParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/ANavigationUpdateParams.java index a1ec5e2a5b..aad9958e9d 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/ANavigationUpdateParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationUpdateParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ANavigationUpdateParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/navigation/ANavigationVoiceRouterMessageParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationVoiceRouterMessageParams.aidl similarity index 55% rename from osmand-api/src/net/osmand/aidl2/navigation/ANavigationVoiceRouterMessageParams.aidl rename to osmand-api/src/net/osmand/aidlapi/navigation/ANavigationVoiceRouterMessageParams.aidl index a7c4929b79..84fd5c2c3a 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/ANavigationVoiceRouterMessageParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationVoiceRouterMessageParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; parcelable ANavigationVoiceRouterMessageParams; diff --git a/osmand-api/src/net/osmand/aidl2/navigation/ANavigationVoiceRouterMessageParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationVoiceRouterMessageParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/navigation/ANavigationVoiceRouterMessageParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/ANavigationVoiceRouterMessageParams.java index 3126ea54a6..4c4ce890d5 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/ANavigationVoiceRouterMessageParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/ANavigationVoiceRouterMessageParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ANavigationVoiceRouterMessageParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/MuteNavigationParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/MuteNavigationParams.aidl new file mode 100644 index 0000000000..99834c101e --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/MuteNavigationParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable MuteNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/MuteNavigationParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/MuteNavigationParams.java similarity index 87% rename from osmand-api/src/net/osmand/aidl2/navigation/MuteNavigationParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/MuteNavigationParams.java index 13fd746231..e23d243eec 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/MuteNavigationParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/MuteNavigationParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class MuteNavigationParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/NavigateGpxParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateGpxParams.aidl new file mode 100644 index 0000000000..8bfcac4266 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateGpxParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable NavigateGpxParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/NavigateGpxParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateGpxParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/navigation/NavigateGpxParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/NavigateGpxParams.java index fce14cddc5..8b4901b35e 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/NavigateGpxParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateGpxParams.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.net.Uri; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class NavigateGpxParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/NavigateParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateParams.aidl new file mode 100644 index 0000000000..3780bda111 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable NavigateParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/NavigateParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateParams.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/navigation/NavigateParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/NavigateParams.java index 3a183e9680..6dff82b7e4 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/NavigateParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class NavigateParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/NavigateSearchParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateSearchParams.aidl new file mode 100644 index 0000000000..8c4acb192f --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateSearchParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable NavigateSearchParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/NavigateSearchParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateSearchParams.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/navigation/NavigateSearchParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/NavigateSearchParams.java index eb53ee63ca..d548dab2f3 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/NavigateSearchParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/NavigateSearchParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class NavigateSearchParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/OnVoiceNavigationParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/OnVoiceNavigationParams.aidl new file mode 100644 index 0000000000..107f69c53b --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/OnVoiceNavigationParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable OnVoiceNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/OnVoiceNavigationParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/OnVoiceNavigationParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/navigation/OnVoiceNavigationParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/OnVoiceNavigationParams.java index 23e2e69be8..f01db63133 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/OnVoiceNavigationParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/OnVoiceNavigationParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/PauseNavigationParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/PauseNavigationParams.aidl new file mode 100644 index 0000000000..6fa3386080 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/PauseNavigationParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable PauseNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/PauseNavigationParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/PauseNavigationParams.java similarity index 87% rename from osmand-api/src/net/osmand/aidl2/navigation/PauseNavigationParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/PauseNavigationParams.java index d25078659b..f5a6cea1f8 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/PauseNavigationParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/PauseNavigationParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class PauseNavigationParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/ResumeNavigationParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/ResumeNavigationParams.aidl new file mode 100644 index 0000000000..3029d59d6a --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/ResumeNavigationParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable ResumeNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/ResumeNavigationParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/ResumeNavigationParams.java similarity index 87% rename from osmand-api/src/net/osmand/aidl2/navigation/ResumeNavigationParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/ResumeNavigationParams.java index 59229d1b62..65d121ce20 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/ResumeNavigationParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/ResumeNavigationParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ResumeNavigationParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/StopNavigationParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/StopNavigationParams.aidl new file mode 100644 index 0000000000..a7f05536c5 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/StopNavigationParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable StopNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/StopNavigationParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/StopNavigationParams.java similarity index 87% rename from osmand-api/src/net/osmand/aidl2/navigation/StopNavigationParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/StopNavigationParams.java index 05e120db29..7be6fe5a4b 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/StopNavigationParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/StopNavigationParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class StopNavigationParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/navigation/UnmuteNavigationParams.aidl b/osmand-api/src/net/osmand/aidlapi/navigation/UnmuteNavigationParams.aidl new file mode 100644 index 0000000000..e58995ca47 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/navigation/UnmuteNavigationParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.navigation; + +parcelable UnmuteNavigationParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/navigation/UnmuteNavigationParams.java b/osmand-api/src/net/osmand/aidlapi/navigation/UnmuteNavigationParams.java similarity index 87% rename from osmand-api/src/net/osmand/aidl2/navigation/UnmuteNavigationParams.java rename to osmand-api/src/net/osmand/aidlapi/navigation/UnmuteNavigationParams.java index 1b68f80b3d..c6ff661e58 100644 --- a/osmand-api/src/net/osmand/aidl2/navigation/UnmuteNavigationParams.java +++ b/osmand-api/src/net/osmand/aidlapi/navigation/UnmuteNavigationParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.navigation; +package net.osmand.aidlapi.navigation; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class UnmuteNavigationParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/note/StartAudioRecordingParams.aidl b/osmand-api/src/net/osmand/aidlapi/note/StartAudioRecordingParams.aidl similarity index 53% rename from osmand-api/src/net/osmand/aidl2/note/StartAudioRecordingParams.aidl rename to osmand-api/src/net/osmand/aidlapi/note/StartAudioRecordingParams.aidl index df0e6cf0e2..5b3bf05b16 100644 --- a/osmand-api/src/net/osmand/aidl2/note/StartAudioRecordingParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/note/StartAudioRecordingParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.note; +package net.osmand.aidlapi.note; parcelable StartAudioRecordingParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/note/StartAudioRecordingParams.java b/osmand-api/src/net/osmand/aidlapi/note/StartAudioRecordingParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/note/StartAudioRecordingParams.java rename to osmand-api/src/net/osmand/aidlapi/note/StartAudioRecordingParams.java index 0e439308fc..21350d42ac 100644 --- a/osmand-api/src/net/osmand/aidl2/note/StartAudioRecordingParams.java +++ b/osmand-api/src/net/osmand/aidlapi/note/StartAudioRecordingParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.note; +package net.osmand.aidlapi.note; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class StartAudioRecordingParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/note/StartVideoRecordingParams.aidl b/osmand-api/src/net/osmand/aidlapi/note/StartVideoRecordingParams.aidl similarity index 53% rename from osmand-api/src/net/osmand/aidl2/note/StartVideoRecordingParams.aidl rename to osmand-api/src/net/osmand/aidlapi/note/StartVideoRecordingParams.aidl index ecfa402594..aa5902909d 100644 --- a/osmand-api/src/net/osmand/aidl2/note/StartVideoRecordingParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/note/StartVideoRecordingParams.aidl @@ -1,3 +1,3 @@ -package net.osmand.aidl2.note; +package net.osmand.aidlapi.note; parcelable StartVideoRecordingParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/note/StartVideoRecordingParams.java b/osmand-api/src/net/osmand/aidlapi/note/StartVideoRecordingParams.java similarity index 94% rename from osmand-api/src/net/osmand/aidl2/note/StartVideoRecordingParams.java rename to osmand-api/src/net/osmand/aidlapi/note/StartVideoRecordingParams.java index 47a6573f28..f66528f9c0 100644 --- a/osmand-api/src/net/osmand/aidl2/note/StartVideoRecordingParams.java +++ b/osmand-api/src/net/osmand/aidlapi/note/StartVideoRecordingParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.note; +package net.osmand.aidlapi.note; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class StartVideoRecordingParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/note/StopRecordingParams.aidl b/osmand-api/src/net/osmand/aidlapi/note/StopRecordingParams.aidl new file mode 100644 index 0000000000..08d6328da2 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/note/StopRecordingParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.note; + +parcelable StopRecordingParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/note/StopRecordingParams.java b/osmand-api/src/net/osmand/aidlapi/note/StopRecordingParams.java similarity index 87% rename from osmand-api/src/net/osmand/aidl2/note/StopRecordingParams.java rename to osmand-api/src/net/osmand/aidlapi/note/StopRecordingParams.java index d9eea9c153..d5ab25940f 100644 --- a/osmand-api/src/net/osmand/aidl2/note/StopRecordingParams.java +++ b/osmand-api/src/net/osmand/aidlapi/note/StopRecordingParams.java @@ -1,8 +1,8 @@ -package net.osmand.aidl2.note; +package net.osmand.aidlapi.note; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class StopRecordingParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/note/TakePhotoNoteParams.aidl b/osmand-api/src/net/osmand/aidlapi/note/TakePhotoNoteParams.aidl new file mode 100644 index 0000000000..a961f2754a --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/note/TakePhotoNoteParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.note; + +parcelable TakePhotoNoteParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/note/TakePhotoNoteParams.java b/osmand-api/src/net/osmand/aidlapi/note/TakePhotoNoteParams.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/note/TakePhotoNoteParams.java rename to osmand-api/src/net/osmand/aidlapi/note/TakePhotoNoteParams.java index 491c54f294..ea255dddb1 100644 --- a/osmand-api/src/net/osmand/aidl2/note/TakePhotoNoteParams.java +++ b/osmand-api/src/net/osmand/aidlapi/note/TakePhotoNoteParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.note; +package net.osmand.aidlapi.note; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class TakePhotoNoteParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidl2/plugins/PluginParams.aidl b/osmand-api/src/net/osmand/aidlapi/plugins/PluginParams.aidl similarity index 57% rename from osmand-api/src/net/osmand/aidl2/plugins/PluginParams.aidl rename to osmand-api/src/net/osmand/aidlapi/plugins/PluginParams.aidl index cba0641032..3005c31269 100644 --- a/osmand-api/src/net/osmand/aidl2/plugins/PluginParams.aidl +++ b/osmand-api/src/net/osmand/aidlapi/plugins/PluginParams.aidl @@ -1,5 +1,5 @@ // PluginParams.aidl -package net.osmand.aidl2.plugins; +package net.osmand.aidlapi.plugins; parcelable PluginParams; diff --git a/osmand-api/src/net/osmand/aidl2/plugins/PluginParams.java b/osmand-api/src/net/osmand/aidlapi/plugins/PluginParams.java similarity index 93% rename from osmand-api/src/net/osmand/aidl2/plugins/PluginParams.java rename to osmand-api/src/net/osmand/aidlapi/plugins/PluginParams.java index ebe85053d6..7c61e6a0d8 100644 --- a/osmand-api/src/net/osmand/aidl2/plugins/PluginParams.java +++ b/osmand-api/src/net/osmand/aidlapi/plugins/PluginParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.plugins; +package net.osmand.aidlapi.plugins; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class PluginParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/search/SearchParams.aidl b/osmand-api/src/net/osmand/aidlapi/search/SearchParams.aidl new file mode 100644 index 0000000000..3fd420433b --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/search/SearchParams.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.search; + +parcelable SearchParams; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/search/SearchParams.java b/osmand-api/src/net/osmand/aidlapi/search/SearchParams.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/search/SearchParams.java rename to osmand-api/src/net/osmand/aidlapi/search/SearchParams.java index b3577817f9..5bbecfb488 100644 --- a/osmand-api/src/net/osmand/aidl2/search/SearchParams.java +++ b/osmand-api/src/net/osmand/aidlapi/search/SearchParams.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.search; +package net.osmand.aidlapi.search; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class SearchParams extends AidlParams { diff --git a/osmand-api/src/net/osmand/aidlapi/search/SearchResult.aidl b/osmand-api/src/net/osmand/aidlapi/search/SearchResult.aidl new file mode 100644 index 0000000000..54b7487a72 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/search/SearchResult.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.search; + +parcelable SearchResult; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/search/SearchResult.java b/osmand-api/src/net/osmand/aidlapi/search/SearchResult.java similarity index 96% rename from osmand-api/src/net/osmand/aidl2/search/SearchResult.java rename to osmand-api/src/net/osmand/aidlapi/search/SearchResult.java index 2117c373c8..863b90b073 100644 --- a/osmand-api/src/net/osmand/aidl2/search/SearchResult.java +++ b/osmand-api/src/net/osmand/aidlapi/search/SearchResult.java @@ -1,9 +1,9 @@ -package net.osmand.aidl2.search; +package net.osmand.aidlapi.search; import android.os.Bundle; import android.os.Parcel; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; import java.util.ArrayList; import java.util.List; diff --git a/osmand-api/src/net/osmand/aidlapi/tiles/ASqliteDbFile.aidl b/osmand-api/src/net/osmand/aidlapi/tiles/ASqliteDbFile.aidl new file mode 100644 index 0000000000..59135d4167 --- /dev/null +++ b/osmand-api/src/net/osmand/aidlapi/tiles/ASqliteDbFile.aidl @@ -0,0 +1,3 @@ +package net.osmand.aidlapi.tiles; + +parcelable ASqliteDbFile; \ No newline at end of file diff --git a/osmand-api/src/net/osmand/aidl2/tiles/ASqliteDbFile.java b/osmand-api/src/net/osmand/aidlapi/tiles/ASqliteDbFile.java similarity index 95% rename from osmand-api/src/net/osmand/aidl2/tiles/ASqliteDbFile.java rename to osmand-api/src/net/osmand/aidlapi/tiles/ASqliteDbFile.java index 989996ad9f..1ea8c70e60 100644 --- a/osmand-api/src/net/osmand/aidl2/tiles/ASqliteDbFile.java +++ b/osmand-api/src/net/osmand/aidlapi/tiles/ASqliteDbFile.java @@ -1,10 +1,10 @@ -package net.osmand.aidl2.tiles; +package net.osmand.aidlapi.tiles; import android.os.Bundle; import android.os.Parcel; import android.support.annotation.NonNull; -import net.osmand.aidl2.AidlParams; +import net.osmand.aidlapi.AidlParams; public class ASqliteDbFile extends AidlParams {