karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-05 12:08:14 -07:00
parent 4e288e4b85
commit c26e63dec3
32 changed files with 1317 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/AndroidManifest.xml
+3 -3
View File
@@ -102,7 +102,7 @@ limitations under the License.
</activity>
<activity android:name="com.google.android.apps.mytracks.SettingsActivity"
android:label="@string/mytracks_settings" >
android:label="@string/settings_title" >
<intent-filter>
<category android:name="android.intent.category.PREFERENCE" />
</intent-filter>
@@ -248,8 +248,8 @@ limitations under the License.
<!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
<permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
android:permissionGroup="android.permission-group.LOCATION"
android:label="@string/mytracks_notifications_permission_label"
android:description="@string/mytracks_notifications_permission_description"
android:label="@string/notification_permission_label"
android:description="@string/notification_permission_label"
android:protectionLevel="signature" />
<!-- We read and write raw track data, obviously. -->