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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-08-30 12:18:38 +02:00
commit 701624fbc2
5 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -1312,7 +1312,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
Intent intent = getIntent(); Intent intent = getIntent();
if (intent != null && intent.getData() != null) { if (intent != null && intent.getData() != null) {
Uri data = intent.getData(); Uri data = intent.getData();
if ("http".equalsIgnoreCase(data.getScheme()) && data.getHost() != null && data.getHost().contains("osmand.net") && if (("http".equalsIgnoreCase(data.getScheme()) || "https".equalsIgnoreCase(data.getScheme()))&& data.getHost() != null && data.getHost().contains("osmand.net") &&
data.getPath() != null && data.getPath().startsWith("/go")) { data.getPath() != null && data.getPath().startsWith("/go")) {
String lat = data.getQueryParameter("lat"); String lat = data.getQueryParameter("lat");
String lon = data.getQueryParameter("lon"); String lon = data.getQueryParameter("lon");

7
OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
View file

@ -761,6 +761,13 @@ public class WaypointDialogHelper {
public void dismiss() { public void dismiss() {
if (app.getPoiFilters().isShowingAnyPoi()) { if (app.getPoiFilters().isShowingAnyPoi()) {
enableType(running, listAdapter, type, enable); enableType(running, listAdapter, type, enable);
} else {
running[0] = -1;
if (helperCallbacks != null) {
helperCallbacks.reloadAdapter();
} else {
reloadListAdapter(listAdapter);
}
} }
} }
}); });

14
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -1251,12 +1251,16 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
return false; return false;
} }
int slideInAnim = R.anim.slide_in_bottom; int slideInAnim = 0;
int slideOutAnim = R.anim.slide_out_bottom; int slideOutAnim = 0;
if (!mapActivity.getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
slideInAnim = R.anim.slide_in_bottom;
slideOutAnim = R.anim.slide_out_bottom;
if (menu.isExtended()) { if (menu.isExtended()) {
slideInAnim = menu.getSlideInAnimation(); slideInAnim = menu.getSlideInAnimation();
slideOutAnim = menu.getSlideOutAnimation(); slideOutAnim = menu.getSlideOutAnimation();
}
} }
MapContextMenuFragment fragment = new MapContextMenuFragment(); MapContextMenuFragment fragment = new MapContextMenuFragment();

9
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
View file

@ -114,8 +114,13 @@ public class MapMultiSelectionMenuFragment extends Fragment implements AdapterVi
MapMultiSelectionMenu menu = mapActivity.getContextMenu().getMultiSelectionMenu(); MapMultiSelectionMenu menu = mapActivity.getContextMenu().getMultiSelectionMenu();
int slideInAnim = menu.getSlideInAnimation(); int slideInAnim = 0;
int slideOutAnim = menu.getSlideOutAnimation(); int slideOutAnim = 0;
if (!mapActivity.getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
slideInAnim = menu.getSlideInAnimation();
slideOutAnim = menu.getSlideOutAnimation();
}
MapMultiSelectionMenuFragment fragment = new MapMultiSelectionMenuFragment(); MapMultiSelectionMenuFragment fragment = new MapMultiSelectionMenuFragment();
menu.getMapActivity().getSupportFragmentManager().beginTransaction() menu.getMapActivity().getSupportFragmentManager().beginTransaction()

3
OsmAnd/src/net/osmand/plus/views/AnimateDraggingMapThread.java
View file

@ -345,7 +345,8 @@ public class AnimateDraggingMapThread {
} }
public void startZooming(final int zoomEnd, final double zoomPart, final boolean notifyListener){ public void startZooming(final int zoomEnd, final double zoomPart, final boolean notifyListener){
final float animationTime = ZOOM_ANIMATION_TIME; boolean doNotUseAnimations = tileView.getSettings().DO_NOT_USE_ANIMATIONS.get();
final float animationTime = doNotUseAnimations ? 0 : ZOOM_ANIMATION_TIME;
startThreadAnimating(new Runnable(){ startThreadAnimating(new Runnable(){
@Override @Override
public void run() { public void run() {