From 70a1c800ce58d4baea8d88b78019bb4cb0bbb797 Mon Sep 17 00:00:00 2001 From: Chumva Date: Wed, 9 Oct 2019 12:07:24 +0300 Subject: [PATCH] Move aidl constants to api --- OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java | 16 +++---- .../net/osmand/aidl/OsmandAidlService.java | 8 ++-- .../osmand/plus/OsmAndAppCustomization.java | 2 +- .../osmand/plus/activities/MapActivity.java | 2 +- .../plus/activities/MapActivityActions.java | 40 +++++++++--------- .../audionotes/AudioVideoNotesPlugin.java | 2 +- .../development/OsmandDevelopmentPlugin.java | 2 +- .../osmand/plus/dialogs/ConfigureMapMenu.java | 42 +++++++++---------- .../plus/mapillary/MapillaryPlugin.java | 2 +- .../osmand/plus/osmedit/OsmEditingPlugin.java | 12 +++--- .../parkingpoint/ParkingPositionPlugin.java | 2 +- .../plus/profiles/EditProfileFragment.java | 2 +- .../rastermaps/OsmandRasterMapsPlugin.java | 8 ++-- .../plus/settings/BaseSettingsFragment.java | 2 +- .../osmand/plus/srtmplugin/SRTMPlugin.java | 4 +- .../osmand/plus/views/ContextMenuLayer.java | 2 +- .../osmand/plus/views/MapControlsLayer.java | 18 ++++---- .../osmand}/OsmAndCustomizationConstants.java | 2 +- .../src/net/osmand}/OsmandAidlConstants.java | 2 +- 19 files changed, 84 insertions(+), 86 deletions(-) rename {OsmAnd/src/net/osmand/plus => osmand-api/src/net/osmand}/OsmAndCustomizationConstants.java (99%) rename {OsmAnd/src/net/osmand/aidl => osmand-api/src/net/osmand}/OsmandAidlConstants.java (98%) diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java index 08caab5c50..eda1af39f0 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java @@ -117,14 +117,14 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; -import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_IO_ERROR; -import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_MAX_LOCK_TIME_MS; -import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_PARAMS_ERROR; -import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT; -import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT_ERROR; -import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR; -import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_WRITE_LOCK_ERROR; -import static net.osmand.aidl.OsmandAidlConstants.OK_RESPONSE; +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.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; diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java index 2cbcf691c2..9a2725f22b 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java @@ -87,10 +87,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import static net.osmand.aidl.OsmandAidlConstants.CANNOT_ACCESS_API_ERROR; -import static net.osmand.aidl.OsmandAidlConstants.MIN_UPDATE_TIME_MS; -import static net.osmand.aidl.OsmandAidlConstants.MIN_UPDATE_TIME_MS_ERROR; -import static net.osmand.aidl.OsmandAidlConstants.UNKNOWN_API_ERROR; +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; public class OsmandAidlService extends Service implements AidlCallbackListener { diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java index 824de9449c..5f61159d56 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java @@ -52,7 +52,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_ITEM_ID_SCHEME; +import static net.osmand.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 a260a8310b..9063f3ce09 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -161,7 +161,7 @@ import java.util.concurrent.Executors; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; +import static net.osmand.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 5ba6b0f456..ec2a26403f 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.plus.OsmAndCustomizationConstants.DRAWER_CONFIGURE_MAP_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_CONFIGURE_SCREEN_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_DASHBOARD_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_DIRECTIONS_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_DIVIDER_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_DOWNLOAD_MAPS_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_HELP_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_MAP_MARKERS_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_MEASURE_DISTANCE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_MY_PLACES_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_OSMAND_LIVE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_PLUGINS_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_SEARCH_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_TRAVEL_GUIDES_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_ADD_GPX_WAYPOINT; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_DIRECTIONS_FROM_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_EDIT_GPX_WP; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MEASURE_DISTANCE; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_SEARCH_NEARBY; +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.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 bb0777836e..7957076f41 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.plus.OsmAndCustomizationConstants.RECORDING_LAYER; +import static net.osmand.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 aaf2ed7ff6..de5c430a84 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.plus.OsmAndCustomizationConstants.DRAWER_BUILDS_ID; +import static net.osmand.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 bc34487e12..de3edefaba 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.plus.OsmAndCustomizationConstants.APP_PROFILES_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.CUSTOM_RENDERING_ITEMS_ID_SCHEME; -import static net.osmand.plus.OsmAndCustomizationConstants.DETAILS_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.FAVORITES_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.GPX_FILES_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.HIDE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_LANGUAGE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_MAGNIFIER_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_MARKERS_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_MODE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_RENDERING_CATEGORY_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_SOURCE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_STYLE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.POI_OVERLAY_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.POI_OVERLAY_LABELS_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.ROAD_STYLE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.ROUTES_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.SHOW_CATEGORY_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.TEXT_SIZE_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.TRANSPORT_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.TRANSPORT_RENDERING_ID; +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.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/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java index 1cbb2fd73e..7a344be3a0 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.plus.OsmAndCustomizationConstants.MAPILLARY; +import static net.osmand.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 a2d18d0c7d..74a7ffc730 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.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_CREATE_POI; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_CHANGE; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_NOTE; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_POI; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_OPEN_OSM_NOTE; -import static net.osmand.plus.OsmAndCustomizationConstants.OSM_NOTES; +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; 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 a76fadd526..8983eb1a68 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.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MARK_AS_PARKING_LOC; +import static net.osmand.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 cb8c5ea751..1f66fb2954 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.plus.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; +import static net.osmand.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 fce15e399b..c69e18aeff 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.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_DOWNLOAD_MAP; -import static net.osmand.plus.OsmAndCustomizationConstants.OVERLAY_MAP; -import static net.osmand.plus.OsmAndCustomizationConstants.UNDERLAY_MAP; -import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_UPDATE_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; 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 6f3cf45df2..7230a6bca1 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.plus.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; +import static net.osmand.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 4e23944e16..92f5e4ff2d 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.plus.OsmAndCustomizationConstants.CONTOUR_LINES; -import static net.osmand.plus.OsmAndCustomizationConstants.HILLSHADE_LAYER; +import static net.osmand.OsmAndCustomizationConstants.CONTOUR_LINES; +import static net.osmand.OsmAndCustomizationConstants.HILLSHADE_LAYER; public class SRTMPlugin extends OsmandPlugin { diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java index d8615c7399..8bf1c1454c 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.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_CHANGE_MARKER_POSITION; +import static net.osmand.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 e6deacfb93..d5f6da6fac 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -9,7 +9,6 @@ import android.annotation.SuppressLint; import android.content.DialogInterface; import android.content.pm.PackageManager; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.PointF; import android.graphics.drawable.Drawable; @@ -52,7 +51,6 @@ import net.osmand.plus.dialogs.DirectionsDialogs; import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.mapcontextmenu.MapContextMenu; import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin; -import net.osmand.plus.routepreparationmenu.ChooseRouteFragment; import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu; import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu.PointType; import net.osmand.plus.routing.RoutingHelper; @@ -65,14 +63,14 @@ import java.util.List; import gnu.trove.list.array.TIntArrayList; -import static net.osmand.plus.OsmAndCustomizationConstants.BACK_TO_LOC_HUD_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.COMPASS_HUD_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.LAYERS_HUD_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.MENU_HUD_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.QUICK_SEARCH_HUD_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.ROUTE_PLANNING_HUD_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.ZOOM_IN_HUD_ID; -import static net.osmand.plus.OsmAndCustomizationConstants.ZOOM_OUT_HUD_ID; +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; public class MapControlsLayer extends OsmandMapLayer { diff --git a/OsmAnd/src/net/osmand/plus/OsmAndCustomizationConstants.java b/osmand-api/src/net/osmand/OsmAndCustomizationConstants.java similarity index 99% rename from OsmAnd/src/net/osmand/plus/OsmAndCustomizationConstants.java rename to osmand-api/src/net/osmand/OsmAndCustomizationConstants.java index 2fba261800..08a58af326 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndCustomizationConstants.java +++ b/osmand-api/src/net/osmand/OsmAndCustomizationConstants.java @@ -1,4 +1,4 @@ -package net.osmand.plus; +package net.osmand; public interface OsmAndCustomizationConstants { diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlConstants.java b/osmand-api/src/net/osmand/OsmandAidlConstants.java similarity index 98% rename from OsmAnd/src/net/osmand/aidl/OsmandAidlConstants.java rename to osmand-api/src/net/osmand/OsmandAidlConstants.java index 583a77c4e1..c0a78543fa 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlConstants.java +++ b/osmand-api/src/net/osmand/OsmandAidlConstants.java @@ -1,4 +1,4 @@ -package net.osmand.aidl; +package net.osmand; public interface OsmandAidlConstants {