Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-09-02 10:30:20 +02:00
commit b0c58bfdcc

View file

@ -9,6 +9,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.actionbarsherlock.app.ActionBar;
import net.osmand.Location;
import net.osmand.StateChangedListener;
import net.osmand.access.AccessibilityPlugin;
@ -254,6 +255,10 @@ public class MapActivity extends AccessibleActivity {
protected void onResume() {
super.onResume();
cancelNotification();
//fixing bug with action bar appearing on android 2.3.3
if (getSupportActionBar() != null){
getSupportActionBar().hide();
}
if (settings.MAP_SCREEN_ORIENTATION.get() != getRequestedOrientation()) {
setRequestedOrientation(settings.MAP_SCREEN_ORIENTATION.get());
// can't return from this method we are not sure if activity will be recreated or not