diff --git a/OsmAnd/res/drawable/back.png b/OsmAnd/res/drawable/back.png
new file mode 100644
index 0000000000..da51117a58
Binary files /dev/null and b/OsmAnd/res/drawable/back.png differ
diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index dc3932d3f9..d0f223ebb8 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -8,7 +8,8 @@
+
-
+
diff --git a/OsmAnd/res/layout/menu.xml b/OsmAnd/res/layout/menu.xml
index ec147e2933..ad2286ea74 100644
--- a/OsmAnd/res/layout/menu.xml
+++ b/OsmAnd/res/layout/menu.xml
@@ -1,15 +1,30 @@
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
diff --git a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java b/OsmAnd/src/com/osmand/activities/MainMenuActivity.java
index 6b4c9dcfc5..da3175b13d 100644
--- a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java
+++ b/OsmAnd/src/com/osmand/activities/MainMenuActivity.java
@@ -27,8 +27,9 @@ public class MainMenuActivity extends Activity {
showMap.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
- final Intent settings = new Intent(MainMenuActivity.this, MapActivity.class);
- startActivity(settings);
+ final Intent mapIndent = new Intent(MainMenuActivity.this, MapActivity.class);
+ startActivityForResult(mapIndent, 0);
+
}
});
settingsButton = (Button) findViewById(R.id.SettingsButton);
diff --git a/OsmAnd/src/com/osmand/activities/MapActivity.java b/OsmAnd/src/com/osmand/activities/MapActivity.java
index 05a9b520e3..d5bf908deb 100644
--- a/OsmAnd/src/com/osmand/activities/MapActivity.java
+++ b/OsmAnd/src/com/osmand/activities/MapActivity.java
@@ -49,6 +49,8 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
private ImageButton backToLocation;
+ private ImageButton backToMenu;
+
private PointOfView pointOfView;
private static final String TILES_PATH = "osmand/tiles/";
@@ -107,17 +109,17 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
});
- Button goToSettings = (Button)findViewById(R.id.GoToSettingsButton);
- goToSettings.setOnClickListener(new OnClickListener(){
+ backToMenu = (ImageButton)findViewById(R.id.BackToMenu);
+ backToMenu.setOnClickListener(new OnClickListener(){
@Override
public void onClick(View v) {
- final Intent settings = new Intent(MapActivity.this, SettingsActivity.class);
- startActivity(settings);
+ Intent intent = new Intent();
+ setResult(RESULT_OK, intent);
+ finish();
}
});
-
-
+
LocationManager service = (LocationManager) getSystemService(LOCATION_SERVICE);
service.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 0, this);
indexPOI = indexPOI();