Skip to content

Commit

Permalink
Merge pull request #2 from pdpiech/development
Browse files Browse the repository at this point in the history
RPI Campus Map Fragment Fully Implemented
  • Loading branch information
nvsio committed Dec 6, 2013
2 parents 6486f00 + bf652be commit ecd0106
Show file tree
Hide file tree
Showing 777 changed files with 3,208 additions and 8,764 deletions.
33 changes: 33 additions & 0 deletions RPIMobile/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,47 @@
android:minSdkVersion="8"
android:targetSdkVersion="17" />

<uses-feature
android:glEsVersion="0x00020000"
android:required="true"/>

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@drawable/rpi_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Sherlock" >

<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />

<!-- Google Maps v2 API key below is for:
SHA1: DE:D6:CF:EB:4F:E3:87:5F:CD:AA:8E:F9:C4:52:5D:B4:02:37:5F:40
Package: edu.rpi.rpimobile
-->
<!-- Release Only:
<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="AIzaSyC0I_BmD-pPhZDp3204l1EzU0QBd4R0TEY"/>
-->

<!-- Google Maps v2 API key below is for:
SHA1: 74:88:34:85:DC:9E:3A:FB:09:91:23:82:40:41:A5:66:2D:42:0A:BB
Package: edu.rpi.rpimobile
-->
<!-- Debug Only: -->
<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="AIzaSyBX5jsjiNB7ShkRkaAnomTfcq2b6h1VseI"/>

<activity
android:name="edu.rpi.rpimobile.MainActivity"
android:label="@string/app_name"
Expand Down
Binary file removed RPIMobile/assets/launcher/rpi_launcher_h.png
Binary file not shown.
Binary file removed RPIMobile/assets/launcher/rpi_launcher_m.png
Binary file not shown.
Binary file removed RPIMobile/assets/launcher/rpi_launcher_xh.png
Binary file not shown.
43 changes: 0 additions & 43 deletions RPIMobile/bin/AndroidManifest.xml

This file was deleted.

Loading

0 comments on commit ecd0106

Please sign in to comment.