Update codeversion for My Tracks 2.0.5 rc4

Make e2e test cases of Sync feature runs well.
Merge heads
2013-07-31 17:10:09 -07:00 · 2013-07-25 20:24:11 +08:00 · 2013-07-25 20:16:22 +08:00 · 2013-07-24 17:14:51 +08:00 · 2013-07-23 12:31:30 -07:00 · 2013-07-23 10:21:39 -07:00
819 changed files with 9569 additions and 9242 deletions
@@ -7,5 +7,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.google.gdt.eclipse.managedapis.MANAGED_API_CONTAINER/fusiontables-v1r16lv1.12.0-beta"/>
 	<classpathentry kind="con" path="com.google.gdt.eclipse.managedapis.MANAGED_API_CONTAINER/gdata-spreadsheet-2.1"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
@@ -16,8 +16,8 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  android:installLocation="auto"
-  android:versionCode="66"
-  android:versionName="2.0.4"
+  android:versionCode="70"
+  android:versionName="2.0.5"
  package="com.google.android.maps.mytracks" >
  <!-- Permission to initialize services -->
  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -26,6 +26,8 @@ limitations under the License.
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
  <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <!-- Permission for activity recognition -->
+  <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
  <!-- Permissions to access sensors -->
  <uses-permission android:name="com.dsi.ant.permission.ANT" />
  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
@@ -136,9 +138,9 @@ limitations under the License.
    android:allowBackup="true"
    android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
    android:hardwareAccelerated="true"
-    android:icon="@drawable/my_tracks_icon"
+    android:icon="@drawable/ic_launcher_my_tracks"
    android:label="@string/my_tracks_app_name"
-    android:theme="@style/ThemeSelector" >
+    android:theme="@style/MyTracks" >
    <!-- For data backup -->
    <meta-data
      android:name="com.google.android.backup.api_key"
@@ -151,6 +153,7 @@ limitations under the License.
    <activity
      android:label="@string/menu_aggregated_statistics"
      android:name="com.google.android.apps.mytracks.AggregatedStatsActivity" />
+    <activity android:name="com.google.android.apps.mytracks.DeleteActivity" />
    <activity
      android:label="@string/menu_help"
      android:name="com.google.android.apps.mytracks.HelpActivity" />
@@ -187,7 +190,13 @@ limitations under the License.
    <activity
      android:label="@string/menu_sensor_state"
      android:name="com.google.android.apps.mytracks.SensorStateActivity" />
-    <activity android:name="com.google.android.apps.mytracks.TrackDetailActivity" />
+    <activity
+      android:name="com.google.android.apps.mytracks.TrackDetailActivity"
+      android:parentActivityName="com.google.android.apps.mytracks.TrackListActivity" >
+      <meta-data
+        android:name="android.support.PARENT_ACTIVITY"
+        android:value="com.google.android.apps.mytracks.TrackListActivity" />
+    </activity>
    <activity android:name="com.google.android.apps.mytracks.TrackEditActivity" />
    <activity android:name="com.google.android.apps.mytracks.TrackListActivity" >
      <intent-filter>
@@ -204,9 +213,6 @@ limitations under the License.
    <activity android:name="com.google.android.apps.mytracks.io.drive.SendDriveActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity" />
-    <activity
-      android:label="@string/maps_list_title"
-      android:name="com.google.android.apps.mytracks.io.maps.ChooseMapActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.spreadsheets.SendSpreadsheetsActivity" />
@@ -237,6 +243,8 @@ limitations under the License.
        android:name="android.content.SyncAdapter"
        android:resource="@xml/sync_adapter" />
    </service>
+    <service
+      android:name="com.google.android.apps.mytracks.services.ActivityRecognitionIntentService" />
    <service
      android:exported="false"
      android:name="com.google.android.apps.mytracks.services.ControlRecordingService" />
@@ -244,7 +252,7 @@ limitations under the License.
    <service
      android:enabled="true"
      android:exported="true"
-      android:icon="@drawable/arrow_320"
+      android:icon="@drawable/ic_arrow_320"
      android:label="@string/my_tracks_recording_service"
      android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
      android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
@@ -4,10 +4,10 @@ applications that wish to use these files should consult the appropriate
 licenses or the JAR's authors.

 Android Support Package:
-android-support-v4.jar (version 11)
+android-support-v4.jar (version 13)

 Ant+:
-antlib.jar - see http://www.thisisant.com/pages/developer-zone/android-api
+antlib.jar - from Android_ANT_SDK_20120625.zip

 Google APIs Client Library for Java:
 google-api-client-1.12.0-beta.jar
--- a/Show More
+++ b/Show More