upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-07 20:03:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge heads

Browse Source
This commit is contained in:
youtaol
2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/AndroidManifest.xml
+3 -8
View File
@@ -170,9 +170,7 @@ limitations under the License.
<data android:scheme="file" />
</intent-filter>
</activity>
<activity
android:name="com.google.android.apps.mytracks.MarkerEditActivity"
android:theme="@style/MyTracks.DialogWhenLarge" />
<activity android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
<activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
<activity android:name="com.google.android.apps.mytracks.MarkerListActivity" >
<meta-data
@@ -199,9 +197,7 @@ limitations under the License.
android:name="android.support.PARENT_ACTIVITY"
android:value="com.google.android.apps.mytracks.TrackListActivity" />
</activity>
<activity
android:name="com.google.android.apps.mytracks.TrackEditActivity"
android:theme="@style/MyTracks.DialogWhenLarge" />
<activity android:name="com.google.android.apps.mytracks.TrackEditActivity" />
<activity android:name="com.google.android.apps.mytracks.TrackListActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -231,8 +227,7 @@ limitations under the License.
<activity android:name="com.google.android.apps.mytracks.settings.StatsSettingsActivity" />
<activity
android:label="@string/track_widget_config_title"
android:name="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity"
android:theme="@style/MyTracks.DialogWhenLarge" >
android:name="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity" >
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>