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 2016-09-01 21:56:18 +02:00
commit 3da044b2a3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
View file

@ -1107,7 +1107,7 @@ public class OpeningHoursParser {
} else if(pair[0].mainNumber == 2) { } else if(pair[0].mainNumber == 2) {
basic.easter = true; basic.easter = true;
} }
} else { } else if(pair[0].mainNumber >= 0){
array[pair[0].mainNumber] = true; array[pair[0].mainNumber] = true;
} }
} }

3
OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus.activities; package net.osmand.plus.activities;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@ -13,7 +14,6 @@ import android.widget.Button;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -121,6 +121,7 @@ public class PluginActivity extends OsmandActionBarActivity {
return false; return false;
} }
@SuppressLint("NewApi")
private void updateState() { private void updateState() {
CompoundButton enableDisableButton = (CompoundButton)findViewById( CompoundButton enableDisableButton = (CompoundButton)findViewById(
R.id.plugin_enable_disable); R.id.plugin_enable_disable);