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

Formatting

Browse source
This commit is contained in:
GaidamakUA 2015-11-17 15:20:00 +02:00
parent 134d5962e9
commit ef040cb293
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -355,6 +355,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
public Object getLastNonConfigurationInstanceByKey(String key) { public Object getLastNonConfigurationInstanceByKey(String key) {
Object k = super.getLastNonConfigurationInstance(); Object k = super.getLastNonConfigurationInstance();
if (k instanceof Map) { if (k instanceof Map) {
return ((Map) k).get(key); return ((Map) k).get(key);
} }
return null; return null;

9
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -19,8 +19,10 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.TextView; import android.widget.TextView;
import net.londatiga.android.ActionItem; import net.londatiga.android.ActionItem;
import net.londatiga.android.QuickAction; import net.londatiga.android.QuickAction;
import net.osmand.PlatformUtil;
import net.osmand.core.android.MapRendererContext; import net.osmand.core.android.MapRendererContext;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.RotatedTileBox; import net.osmand.data.RotatedTileBox;
@ -38,11 +40,16 @@ import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.controls.MapRouteInfoControl; import net.osmand.plus.views.controls.MapRouteInfoControl;
import net.osmand.plus.views.controls.MapRoutePreferencesControl; import net.osmand.plus.views.controls.MapRoutePreferencesControl;
import net.osmand.plus.views.corenative.NativeCoreContext; import net.osmand.plus.views.corenative.NativeCoreContext;
import org.apache.commons.logging.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import gnu.trove.list.array.TIntArrayList; import gnu.trove.list.array.TIntArrayList;
public class MapControlsLayer extends OsmandMapLayer { public class MapControlsLayer extends OsmandMapLayer {
private static final Log LOG = PlatformUtil.getLog(MapControlsLayer.class);
private static final int TIMEOUT_TO_SHOW_BUTTONS = 7000; private static final int TIMEOUT_TO_SHOW_BUTTONS = 7000;
public static final int REQUEST_ADDRESS_SELECT = 2; public static final int REQUEST_ADDRESS_SELECT = 2;
@ -865,7 +872,7 @@ public class MapControlsLayer extends OsmandMapLayer {
nightMode = night; nightMode = night;
if (bgDark != 0 && bgLight != 0) { if (bgDark != 0 && bgLight != 0) {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight, iv.setBackground(ctx.getResources().getDrawable(night ? bgDark : bgLight,
mapActivity.getTheme())); mapActivity.getTheme()));
} else { } else {
iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight)); iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));