ricky/location_library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v3'

Browse Source 
Conflicts:
	LocationLib/libs/android-support-v4-r11-googlemaps.jar
	LocationLib/src/com/TwentyCodes/android/fragments/BaseMapFragment.java
	LocationLib/src/com/TwentyCodes/android/location/MidPoint.java
	LocationLib/src/com/TwentyCodes/android/overlays/RadiusOverlay.java
This commit is contained in:
Ricky Barrette
2014-08-31 22:46:12 -04:00
parent 85f1c8c606 b5e1984c0f
commit 4ca015c7cd
17 changed files with 224 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LocationLib/res/layout/base_map_fragment.xml
View File

@@ -13,7 +13,7 @@
android:id="@+id/mapview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:apiKey="0rKmsWMM0D-LWOndcfwrmW-S0OXlnQl2SJCMeTg" />
android:apiKey="0rKmsWMM0D-IRAEgcSZEqwZCs_8AUwxjYjj0bnA" />
<ProgressBar
android:id="@+id/mapProgressBar"