git-svn-id: https://osmand.googlecode.com/svn/trunk@470 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-08-18 21:27:56 +00:00
parent 4cb8a0731b
commit aa078129de
2 changed files with 11 additions and 5 deletions

View file

@ -376,8 +376,11 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
@Override @Override
protected void onStop() { protected void onStop() {
mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); // TODO keep this check?
mNotificationManager.notify(APP_NOTIFICATION_ID, getNotification()); if(routingHelper.isFollowingMode()){
mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
mNotificationManager.notify(APP_NOTIFICATION_ID, getNotification());
}
if(progressDlg != null){ if(progressDlg != null){
progressDlg.dismiss(); progressDlg.dismiss();
progressDlg = null; progressDlg = null;
@ -389,7 +392,9 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
savingTrackHelper.close(); savingTrackHelper.close();
mNotificationManager.cancel(APP_NOTIFICATION_ID); if(mNotificationManager != null){
mNotificationManager.cancel(APP_NOTIFICATION_ID);
}
MapTileDownloader.getInstance().removeDownloaderCallback(mapView); MapTileDownloader.getInstance().removeDownloaderCallback(mapView);
} }

View file

@ -281,6 +281,9 @@ public class SearchAddressActivity extends Activity {
} }
streetButton.setEnabled(city != null || postcode != null); streetButton.setEnabled(city != null || postcode != null);
buildingButton.setEnabled(street != null);
((RadioGroup)findViewById(R.id.RadioGroup)).setVisibility(street == null ? View.GONE : View.VISIBLE);
if(radioBuilding){ if(radioBuilding){
((RadioButton)findViewById(R.id.RadioBuilding)).setChecked(true); ((RadioButton)findViewById(R.id.RadioBuilding)).setChecked(true);
} else { } else {
@ -288,8 +291,6 @@ public class SearchAddressActivity extends Activity {
} }
updateBuildingSection(); updateBuildingSection();
buildingButton.setEnabled(street != null);
showOnMap.setEnabled(city != null || street != null); showOnMap.setEnabled(city != null || street != null);
navigateTo.setEnabled(city != null || street != null); navigateTo.setEnabled(city != null || street != null);
} }