Merge branch 'dev' into beta

jguerinet · Feb 11, 2015 · 3862198 · 3862198
2 parents 080b3df + ade40db
commit 3862198
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/MyMartlet/AndroidManifest.xml b/MyMartlet/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ca.appvelopers.mcgillmobile"
-    android:versionCode="11"
+    android:versionCode="12"
     android:versionName="2.0" >
 
     <uses-sdk

diff --git a/MyMartlet/src/ca/appvelopers/mcgillmobile/fragment/map/MapFragment.java b/MyMartlet/src/ca/appvelopers/mcgillmobile/fragment/map/MapFragment.java
@@ -214,10 +214,8 @@ public boolean onMarkerClick(Marker marker) {
                     if (mPlaceMarker != null) {
                         mPlaceMarker.mMarker.setIcon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_RED));
                     }
-                    //If it was null, we need to pull up the info container
-                    else {
-                        mInfoContainer.setVisibility(View.VISIBLE);
-                    }
+                    //Pull up the info container
+                    mInfoContainer.setVisibility(View.VISIBLE);
 
                     //Find the concerned place
                     mPlaceMarker = findPlace(marker);