Update observation view after edit

Author: newmanw

mage/src/main/java/mil/nga/giat/mage/observation/ObservationViewActivity.java

@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
@@ -41,7 +40,6 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
-import java.util.TimeZone;
 
 import mil.nga.giat.mage.R;
 import mil.nga.giat.mage.form.LayoutBaker;
@@ -253,6 +251,7 @@ public void onClick(View v) {
 					LatLng location = new LatLng(pointGeo.getY(), pointGeo.getX());
 					map.moveCamera(CameraUpdateFactory.newLatLngZoom(location, map.getCameraPosition().zoom));
 					marker.setPosition(location);
+					marker.setIcon(ObservationBitmapFactory.bitmapDescriptor(this, o));
 				}
 			}
 
@@ -265,10 +264,12 @@ public void onClick(View v) {
 
             LinearLayout galleryLayout = (LinearLayout) findViewById(R.id.image_gallery);
             galleryLayout.removeAllViews();
+
 			if (o.getAttachments().size() == 0) {
 				findViewById(R.id.gallery_container).setVisibility(View.GONE);
 			} else {
-                attachmentGallery = new AttachmentGallery(getApplicationContext(), 150, 150);
+				findViewById(R.id.gallery_container).setVisibility(View.VISIBLE);
+				attachmentGallery = new AttachmentGallery(getApplicationContext(), 150, 150);
                 attachmentGallery.addOnAttachmentClickListener(new AttachmentGallery.OnAttachmentClickListener() {
                     @Override
                     public void onAttachmentClick(Attachment attachment) {