fix commit
git-svn-id: https://osmand.googlecode.com/svn/trunk@130 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
parent
abef9a8eff
commit
1d305b8fe1
3 changed files with 5 additions and 4 deletions
|
@ -14,7 +14,7 @@
|
||||||
<activity android:name=".activities.SettingsActivity" android:label="@string/settings_activity"></activity>
|
<activity android:name=".activities.SettingsActivity" android:label="@string/settings_activity"></activity>
|
||||||
<activity android:name=".activities.search.SearchActivity" android:label="@string/search_activity" ></activity>
|
<activity android:name=".activities.search.SearchActivity" android:label="@string/search_activity" ></activity>
|
||||||
<activity android:name=".activities.NavigatePointActivity"></activity>
|
<activity android:name=".activities.NavigatePointActivity"></activity>
|
||||||
<activity android:name=".activities.FavouritesActivity"></activity>
|
<activity android:name=".activities.FavouritesActivity" android:label="@string/favourites_activity"></activity>
|
||||||
|
|
||||||
<activity android:name=".activities.search.SearchPOIActivity" android:label="@string/searchpoi_activity"></activity>
|
<activity android:name=".activities.search.SearchPOIActivity" android:label="@string/searchpoi_activity"></activity>
|
||||||
<activity android:name=".activities.search.SearchPOIListActivity"></activity>
|
<activity android:name=".activities.search.SearchPOIListActivity"></activity>
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
<string name="favourites_activity">List of favourite points</string>
|
||||||
<string name="add_to_favourite">Add to Favourites</string>
|
<string name="add_to_favourite">Add to Favourites</string>
|
||||||
<string name="use_english_names_descr">Select use native or english names</string>
|
<string name="use_english_names_descr">Select use native or english names</string>
|
||||||
<string name="use_english_names">Use english names</string>
|
<string name="use_english_names">Use english names</string>
|
||||||
|
|
|
@ -133,7 +133,7 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
|
||||||
backToLocation.setOnClickListener(new OnClickListener(){
|
backToLocation.setOnClickListener(new OnClickListener(){
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
backToLocation.setVisibility(View.VISIBLE);
|
backToLocation.setVisibility(View.INVISIBLE);
|
||||||
if(!isMapLinkedToLocation()){
|
if(!isMapLinkedToLocation()){
|
||||||
getPreferences(MODE_WORLD_READABLE).edit().putBoolean(BACK_TO_LOCATION, true).commit();
|
getPreferences(MODE_WORLD_READABLE).edit().putBoolean(BACK_TO_LOCATION, true).commit();
|
||||||
if(locationLayer.getLastKnownLocation() != null){
|
if(locationLayer.getLastKnownLocation() != null){
|
||||||
|
@ -213,8 +213,8 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if(backToLocation.getVisibility() != View.VISIBLE){
|
if(backToLocation.getVisibility() != View.INVISIBLE){
|
||||||
backToLocation.setVisibility(View.VISIBLE);
|
backToLocation.setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue