merge heads

MyTracks/.classpath

@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/google-common.jar"/>
-	<classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/commons-codec-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/google-api-client/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-api-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-http-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/gson-1.6.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/guava-r09.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/jackson-core-asl-1.6.7.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/jsr305-1.3.9.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

MyTracks/AndroidManifest.xml

@@ -15,28 +15,29 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.android.maps.mytracks"
-          android:installLocation="auto"
-          android:versionCode="38"
-          android:versionName="1.1.15">
+  android:installLocation="auto"
+  android:versionCode="39"
+  android:versionName="1.1.16"
+  package="com.google.android.maps.mytracks" >
 
-  <!-- Permissions to initialize service -->
+  <!-- Permission to initialize services -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
-  <!-- Permissions for recording tracks and showing maps -->
+  <!-- Permissions to record locations -->
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+  <!-- Permissions to access sensors -->
+  <uses-permission android:name="com.dsi.ant.permission.ANT" />
+  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
-  <uses-permission android:name="com.dsi.ant.permission.ANT" />
-  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
-
-  <!-- Permissions for uploading tracks -->
+  <!-- Permissions to upload tracks -->
   <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+  <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
   <uses-permission android:name="android.permission.USE_CREDENTIALS" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
@@ -46,269 +47,291 @@ limitations under the License.
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
   <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
 
-  <!-- Permissions for misc services -->
+  <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-  <!-- Exported permissions (for other apps to use our features) -->
-  <!-- Permission to get track start/end broadcasts -->
-  <permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_notification_label"
-              android:description="@string/permission_notification_description"
-              android:protectionLevel="dangerous" />
-  <!-- Permission to read raw track data (points, etc.) -->
-  <permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_read_label"
-              android:description="@string/permission_read_description"
-              android:protectionLevel="dangerous" />
-  <!-- Permission to write track data, either raw or by making service calls -->
-  <permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_write_label"
-              android:description="@string/permission_write_description"
-              android:protectionLevel="dangerous" />
+  <!-- Permission to write to SD card -->
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-  <!-- 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/permission_notification_label"
-              android:description="@string/permission_notification_label"
-              android:protectionLevel="signature" />
-
-  <!-- We read and write raw track data, obviously. -->
+  <!-- Permissions to access My Tracks data -->
+  <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
   <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
   <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-  <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
 
-  <!-- Features required -->
-  <uses-feature android:name="android.hardware.location" android:required="true"/>
-  <uses-feature android:name="android.hardware.location.gps" android:required="true"/>
+  <!-- Permission to receive My Tracks internal broadcasts -->
+  <permission
+    android:description="@string/permission_notification_label"
+    android:label="@string/permission_notification_label"
+    android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
+    android:permissionGroup="android.permission-group.LOCATION"
+    android:protectionLevel="signature" />
+  <!-- Permission to read track data -->
+  <permission
+    android:description="@string/permission_read_description"
+    android:label="@string/permission_read_label"
+    android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
+    android:permissionGroup="android.permission-group.LOCATION"
+    android:protectionLevel="dangerous" />
+  <!-- Permission to receive track start/end broadcasts -->
+  <permission
+    android:description="@string/permission_notification_description"
+    android:label="@string/permission_notification_label"
+    android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
+    android:permissionGroup="android.permission-group.LOCATION"
+    android:protectionLevel="dangerous" />
+  <!-- Permission to write track data, either directly or through service calls -->
+  <permission
+    android:description="@string/permission_write_description"
+    android:label="@string/permission_write_label"
+    android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
+    android:permissionGroup="android.permission-group.LOCATION"
+    android:protectionLevel="dangerous" />
 
-  <!-- Features optional -->
-  <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
-  <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
-  <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-  <uses-feature android:name="android.hardware.sensor.compass" android:required="false"/>
-  <uses-feature android:name="android.hardware.telephony" android:required="false"/>
-  <uses-feature android:name="android.hardware.telephony.gsm" android:required="false"/>
-  <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  <uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="false"/>
+  <uses-sdk
+    android:minSdkVersion="7"
+    android:targetSdkVersion="15" />
+
+  <!-- Required features -->
+  <uses-feature
+    android:name="android.hardware.location"
+    android:required="true" />
+  <uses-feature
+    android:name="android.hardware.location.gps"
+    android:required="true" />
+
+  <!-- Optional features -->
+  <uses-feature
+    android:name="android.hardware.bluetooth"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.faketouch"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.location.network"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.sensor.compass"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.telephony"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.telephony.gsm"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.touchscreen"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.touchscreen.multitouch"
+    android:required="false" />
 
-  <uses-sdk android:minSdkVersion="7"/>
   <supports-screens
-          android:xlargeScreens="true"
-          android:largeScreens="true"
-          android:normalScreens="true"
-          android:smallScreens="true"
-          android:anyDensity="true" />
+    android:anyDensity="true"
+    android:largeScreens="true"
+    android:normalScreens="true"
+    android:smallScreens="true"
+    android:xlargeScreens="true" />
 
-  <application android:icon="@drawable/arrow_icon"
-               android:label="@string/my_tracks_app_name"
-               android:name="com.google.android.apps.mytracks.MyTracksApplication"
-               android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
-    <uses-library android:name="com.google.android.maps" />
+  <application
+    android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
+    android:icon="@drawable/arrow_icon"
+    android:label="@string/my_tracks_app_name"
+    android:name="com.google.android.apps.mytracks.MyTracksApplication"
+    android:theme="@style/ThemeSelector" >
 
-    <meta-data android:name="com.google.android.backup.api_key"
-               android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
+    <!-- For data backup -->
+    <meta-data
+      android:name="com.google.android.backup.api_key"
+      android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
 
-    <!-- Main track data provider -->
-    <provider android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
-              android:authorities="com.google.android.maps.mytracks"
-              android:exported="true"
-              android:readPermission="com.google.android.apps.mytracks.READ_TRACK_DATA"
-              android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
-    <!-- Provider for search suggestions -->
-    <provider android:name="com.google.android.apps.mytracks.content.SearchEngineProvider"
-              android:authorities="com.google.android.maps.mytracks.search"
-              android:exported="false" />
-
-    <!-- Main activity -->
-    <activity android:name="com.google.android.apps.mytracks.MyTracks"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
-      </intent-filter>
-
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.MapActivity"
-              android:exported="false">
+    <activity
+      android:label="@string/menu_aggregated_statistics"
+      android:name="com.google.android.apps.mytracks.AggregatedStatsActivity" />
+    <activity
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.ChartActivity" >
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
       </intent-filter>
 
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
-
-
-    <!-- TODO: Merge TrackList, WaypointsLIst and SearchActivity, then implement VIEW and PICK for track and waypoint cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.TrackList">
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
-
-    <!-- TODO: VIEW and PICK for waypoint cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.WaypointsList">
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.TrackDetail"
-              android:label="@string/track_detail_title">
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>  
+    <activity android:name="com.google.android.apps.mytracks.ExportActivity"/>
+    <activity
+      android:label="@string/my_tracks_importer"
+      android:name="com.google.android.apps.mytracks.ImportActivity"
+      android:noHistory="true"
+      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
       <intent-filter>
-        <action android:name="android.intent.action.EDIT" />
-        <category android:name="android.intent.category.DEFAULT" />
+
+        <action android:name="android.intent.action.ATTACH_DATA" />
+        <action android:name="android.intent.action.VIEW" />
+
         <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.DeleteTrack"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
-      <intent-filter>
-        <action android:name="android.intent.action.DELETE" />
         <category android:name="android.intent.category.DEFAULT" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
+
+        <data android:mimeType="application/gpx" />
+        <data android:mimeType="application/gpx+xml" />
+        <data android:mimeType="application/vnd.google-earth.gpx" />
+        <data android:mimeType="application/vnd.google-earth.gpx+xml" />
+        <data android:scheme="file" />
       </intent-filter>
     </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.WaypointDetails"
-              android:label="@string/marker_detail_title">
+    <activity
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.MapActivity" >
       <intent-filter>
-        <action android:name="android.intent.action.EDIT" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
+        <category android:name="android.intent.category.TAB" />
       </intent-filter>
-    </activity>
 
-    <activity android:name="com.google.android.apps.mytracks.SettingsActivity"
-              android:label="@string/settings_title" >
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
+    <activity
+      android:launchMode="singleTop"
+      android:name="com.google.android.apps.mytracks.SearchActivity" >
+      <intent-filter>
+        <action android:name="android.intent.action.SEARCH" />
+      </intent-filter>
+
+      <meta-data
+        android:name="android.app.searchable"
+        android:resource="@xml/search" />
+    </activity>
+    <activity
+      android:label="@string/menu_sensor_state"
+      android:name="com.google.android.apps.mytracks.SensorStateActivity" />
+    <activity
+      android:label="@string/settings_title"
+      android:name="com.google.android.apps.mytracks.SettingsActivity" >
       <intent-filter>
         <category android:name="android.intent.category.PREFERENCE" />
       </intent-filter>
     </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
-              android:label="@string/menu_aggregated_statistics" />
-
-    <activity android:name="com.google.android.apps.mytracks.StatsActivity"
-              android:exported="false">
+    <activity
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.StatsActivity" >
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
       </intent-filter>
 
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
     </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.SensorStateActivity"
-              android:label="@string/menu_sensor_state" />
-
-    <activity android:name="com.google.android.apps.mytracks.ChartActivity"
-              android:exported="false">
+    <activity android:name="com.google.android.apps.mytracks.TrackDetailActivity" />
+    <activity
+      android:label="@string/track_edit_title"
+      android:name="com.google.android.apps.mytracks.TrackEditActivity" >
       <intent-filter>
-        <category android:name="android.intent.category.TAB" />
-      </intent-filter>
+        <action android:name="android.intent.action.EDIT" />
 
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
+        <category android:name="android.intent.category.BROWSABLE" />
+        <category android:name="android.intent.category.DEFAULT" />
 
-    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
-      <intent-filter>
-        <action android:name="android.intent.action.SAVE" />
         <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
       </intent-filter>
     </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity"
-              android:label="@string/my_tracks_importer"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
+    <activity android:name="com.google.android.apps.mytracks.TrackListActivity" >
       <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <action android:name="android.intent.action.ATTACH_DATA" />
-        <category android:name="android.intent.category.DEFAULT" />
+        <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
+    <activity
+      android:label="@string/marker_detail_title"
+      android:name="com.google.android.apps.mytracks.WaypointDetails" >
+      <intent-filter>
+        <action android:name="android.intent.action.EDIT" />
+
         <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="file" />
-        <data android:mimeType="application/gpx+xml" />
-        <data android:mimeType="application/gpx" />
-        <data android:mimeType="application/vnd.google-earth.gpx" />
-        <data android:mimeType="application/vnd.google-earth.gpx+xml" />
+        <category android:name="android.intent.category.DEFAULT" />
+
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
       </intent-filter>
     </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
-              android:label="@string/welcome_title"
-              android:exported="false" />
-
-    <activity android:name="com.google.android.apps.mytracks.SearchActivity"
-              android:launchMode="singleTop">
+    <activity android:name="com.google.android.apps.mytracks.WaypointsList" >
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
+    <activity
+      android:exported="false"
+      android:label="@string/welcome_title"
+      android:name="com.google.android.apps.mytracks.WelcomeActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.backup.BackupActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity" />
+    <activity
+      android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
+      android:noHistory="true"
+      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
       <intent-filter>
-        <action android:name="android.intent.action.SEARCH" />
+        <action android:name="android.intent.action.SAVE" />
+
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
       </intent-filter>
-      <meta-data android:name="android.app.searchable"
-                 android:resource="@xml/search"/>
     </activity>
+    <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.AccountChooserActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity" />
+                
+    <service
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.services.ControlRecordingService" />
+    <service android:name="com.google.android.apps.mytracks.services.RemoveTempFilesService" />
+    <service
+      android:enabled="true"
+      android:exported="true"
+      android:icon="@drawable/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" />
 
-    <activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.maps.ChooseMapActivity"
-                            android:label="@string/maps_list_title"/>
-    <activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity"/>
-
-    <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
-             android:label="@string/my_tracks_recording_service"
-             android:icon="@drawable/arrow_320"
-             android:enabled="true"
-             android:exported="true"
-             android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
-    <service android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
-             android:exported="false" />
-    <service android:name="com.google.android.apps.mytracks.services.RemoveTempFilesService"/>
-
-    <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
+    <receiver android:name="com.google.android.apps.mytracks.BootReceiver" >
       <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED" />
       </intent-filter>
     </receiver>
-
-    <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider">
+    <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider" >
       <intent-filter>
         <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
         <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
         <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
       </intent-filter>
-      <meta-data android:name="android.appwidget.provider"
-                 android:resource="@xml/track_widget_info" />
+
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/track_widget_info" />
     </receiver>
+
+    <!-- My Tracks data provider -->
+    <provider
+      android:authorities="com.google.android.maps.mytracks"
+      android:exported="true"
+      android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
+      android:readPermission="com.google.android.apps.mytracks.READ_TRACK_DATA"
+      android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+    <!-- Search suggestion provider -->
+    <provider
+      android:authorities="com.google.android.maps.mytracks.search"
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.content.SearchEngineProvider" />
+
+    <uses-library android:name="com.google.android.maps" />
   </application>
-</manifest>
+
+</manifest>

MyTracks/libs/README.txt

@@ -3,10 +3,21 @@ own licenses, which allow their usage for the My Tracks application. Any other
 applications that wish to use these files should consult the appropriate
 licenses or the JAR's authors.
 
-google-api-client/
-- see http://code.google.com/p/google-api-java-client/.
-- contains Google API client library, google-api-client-1.5.0-beta.jar, and its
-  dependencies.
+Android Support Package:
+android-support-v4.jar
+- see http://developer.android.com/sdk/compatibility-library.html
+
+Google APIs Client Library for Java:
+commons-codec-1.3.jar
+commons-logging-1.1.1.jar
+google-api-client-1.5.0-beta.jar
+google-http-client-1.5.0-beta.jar
+google-oauth-client-1.5.0-beta.jar
+gson-1.6.jar
+guava-r09.jar
+jackson-core-asl-1.6.7.jar
+jsr305-1.3.9.jar
+- see http://code.google.com/p/google-api-java-client/
 - google-api-client-1.5.0-beta.jar depends on protobuf-java-2.2.0.jar, however,
   MyTracksLib already includes protobuf-java.2.3.0-lite.jar. Thus using the
   newer version, protobuf-java.2.3.0-lite.jar.
@@ -14,9 +25,9 @@ google-api-client/
   some of its classes are already included in the android framework, thus not
   including xpp3-1.1.4c.jar.
 
-google-common.jar
-
-googleloginclient-helper.jar
-
+Google Analytics:
 libGoogleAnalytics.jar
-- see http://code.google.com/mobile/analytics/docs/.
+- see http://code.google.com/apis/analytics/docs/mobile/android.html
+
+Others:
+google-common.jar

MyTracks/proguard.cfg

@@ -1,52 +1,56 @@
--target 6
--optimizationpasses 5
+# 
+# Section 1
+# Default eclipse project proguard settings.
+#
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
--dontpreverify
 -verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
 
-# Add the libraries, but ignore warnings about them
--libraryjars libs
--libraryjars ../MyTracksLib/libs
--dontwarn com.google.android.googleapps.**
--dontwarn com.android.common.**
--dontwarn com.google.android.gsf.**
--dontwarn org.codehaus.**
--dontwarn com.google.appengine.**
--dontwarn org.apache.avalon.framework.logger.**
--dontwarn org.apache.log.**
--dontwarn org.apache.log4j.**
--dontwarn javax.servlet.**
+-dontpreverify
 
-# Make our stack traces useful
-# Line numbers will be correct, file names will be replaced by "MT" since the
-# class name is enough to get the file name.
--renamesourcefileattribute MT
--keepattributes SourceFile,LineNumberTable
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+# change from 5 to 2. With 5 passes, the CursorLoader in the android.support.v4 will not compile.
+# See http://stackoverflow.com/questions/6605971/android-sdk-tools-revision-12-has-problem-with-proguard-error-conversion-to
+-optimizationpasses 2
+-allowaccessmodification
 
-# Keep everything android references from XMLs
+-keepattributes *Annotation*
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
 -keep public class * extends android.app.Service
--keep public class * extends android.app.backup.BackupAgent
 -keep public class * extends android.content.BroadcastReceiver
 -keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgent
 -keep public class * extends android.preference.Preference
+-keep public class * extends android.support.v4.app.Fragment
+-keep public class * extends android.app.Fragment
 -keep public class com.android.vending.licensing.ILicensingService
 
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
 -keepclasseswithmembernames class * {
     native <methods>;
 }
 
--keepclasseswithmembernames class * {
+-keep public class * extends android.view.View {
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+    public void set*(...);
+}
+
+-keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet);
 }
 
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
 
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
 -keepclassmembers enum * {
     public static **[] values();
     public static ** valueOf(java.lang.String);
@@ -56,20 +60,55 @@
   public static final android.os.Parcelable$Creator *;
 }
 
-# Needed by google-api-client to keep generic types and @Key annotations accessed via reflection
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
 
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version.  We know about them, and they are safe.
+-dontwarn android.support.**
+
+#
+# Section 2
+# Google APIs Client Library for Java proguard settings.
+#
+
+# Needed by google-api-client to keep generic types and @Key annotations accessed via reflection
 -keepclassmembers class * {
   @com.google.api.client.util.Key <fields>;
 }
-
 -keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault
 
 # Needed by Guava
-
 -dontwarn sun.misc.Unsafe
 
+# See https://groups.google.com/forum/#!topic/guava-discuss/YCZzeCiIVoI
+-dontwarn com.google.common.collect.MinMaxPriorityQueue
+
+# 
+# Section 3
+# My Tracks specific proguard settings.
+#
+
+# Add the libraries, but ignore warnings about them
+-libraryjars libs
+-libraryjars ../MyTracksLib/libs
+-dontwarn com.android.common.**
+-dontwarn com.google.android.googleapps.**
+-dontwarn com.google.android.gsf.**
+-dontwarn javax.servlet.**
+-dontwarn org.apache.avalon.framework.logger.**
+-dontwarn org.apache.log.**
+-dontwarn org.apache.log4j.**
+
+# Make our stack traces useful
+# Line numbers will be correct, file names will be replaced by "MT" since the
+# class name is enough to get the file name.
+-renamesourcefileattribute MT
+-keepattributes SourceFile,LineNumberTable
+
 # Keep services needed by ANT+ protocol
 -keep public class com.dsi.ant.IAnt_6
 -keep public class com.dsi.ant.IAnt
 -keep public class com.dsi.ant.IServiceSettings
-