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

Fix 2.3 crash

Browse source
This commit is contained in:
Alexey Kulish 2016-02-27 19:33:31 +03:00
parent 5b86826305
commit aad61b6f8f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -1143,7 +1143,7 @@ public class OsmandSettings {
public final OsmandPreference<Boolean> SHOULD_SHOW_FREE_VERSION_BANNER = new BooleanPreference("should_show_free_version_banner", false).makeGlobal().cache(); public final OsmandPreference<Boolean> SHOULD_SHOW_FREE_VERSION_BANNER = new BooleanPreference("should_show_free_version_banner", false).makeGlobal().cache();
public final OsmandPreference<Boolean> USE_MAP_MARKERS = new BooleanPreference("use_map_markers", false).makeGlobal().cache(); public final OsmandPreference<Boolean> USE_MAP_MARKERS = new BooleanPreference("use_map_markers", true).makeGlobal().cache();
public final CommonPreference<MapMarkersMode> MAP_MARKERS_MODE = public final CommonPreference<MapMarkersMode> MAP_MARKERS_MODE =
new EnumIntPreference<>("map_markers_mode", MapMarkersMode.TOOLBAR, MapMarkersMode.values()); new EnumIntPreference<>("map_markers_mode", MapMarkersMode.TOOLBAR, MapMarkersMode.values());

4
OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java
View file

@ -715,7 +715,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
} }
if (mSwiping) { if (mSwiping) {
mSwipeDownView.setTranslationX(deltaX); ViewCompat.setTranslationX(mSwipeDownView, deltaX);
ViewCompat.setAlpha(mSwipeDownView, Math.max(0f, Math.min(1f, ViewCompat.setAlpha(mSwipeDownView, Math.max(0f, Math.min(1f,
1f - 2f * Math.abs(deltaX) / mViewWidth))); 1f - 2f * Math.abs(deltaX) / mViewWidth)));
return true; return true;
@ -815,7 +815,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
ViewGroup.LayoutParams lp; ViewGroup.LayoutParams lp;
for (PendingDismissData pendingDismiss : mPendingDismisses) { for (PendingDismissData pendingDismiss : mPendingDismisses) {
ViewCompat.setAlpha(pendingDismiss.view, 1f); ViewCompat.setAlpha(pendingDismiss.view, 1f);
pendingDismiss.view.setTranslationX(0); ViewCompat.setTranslationX(pendingDismiss.view, 0);
lp = pendingDismiss.childView.getLayoutParams(); lp = pendingDismiss.childView.getLayoutParams();
lp.height = originalLayoutHeight; lp.height = originalLayoutHeight;
pendingDismiss.childView.setLayoutParams(lp); pendingDismiss.childView.setLayoutParams(lp);