From 555805b3205c2d830841e4fa0a5a0c3cced0dfe3 Mon Sep 17 00:00:00 2001
From: Aran Zaiger <aranzaiger@gmail.com>
Date: Sun, 10 Jul 2016 15:24:54 +0300
Subject: [PATCH] Merge branch 'master' of
 https://github.com/sagidayan/TheSocialNotework-Android

# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
---
 .../matan/ara/sagi/thesocialnotework/GmapFragment.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
index 24a3e03..ef87c20 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
@@ -40,6 +40,8 @@ import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.Circle;
+import com.google.android.gms.maps.model.CircleOptions;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
@@ -84,6 +86,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
     private Long dateFilterSelection;
     private float locationFilterSelection;
     List<Note> listOfNotes;
+    private Circle onMapCircle;
 
     private final String day = "24 hours";
     private final String week = "Week";