Code cleanup: DeleteTest.java

Code cleanup: SettingsTest.java
Code cleanup: PauseResumeTest
2014-01-31 14:36:08 -08:00 · 2014-01-31 14:12:33 -08:00 · 2014-01-31 12:35:41 -08:00 · 2014-01-31 10:52:21 -08:00 · 2014-01-30 16:33:37 -08:00 · 2014-01-30 16:19:13 -08:00
988 changed files with 19020 additions and 16534 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 exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
@@ -1,4 +1,6 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
@@ -64,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=1585
 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent=1585|-1|1585
@@ -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="74"
+  android:versionName="2.0.6"
  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" />
@@ -90,7 +92,7 @@ limitations under the License.
  <uses-permission android:name="com.google.android.maps.mytracks.permission.MAPS_RECEIVE" />
  <uses-sdk
    android:minSdkVersion="8"
-    android:targetSdkVersion="17" />
+    android:targetSdkVersion="19" />
  <!-- Required features -->
  <uses-feature
    android:glEsVersion="0x00020000"
@@ -105,6 +107,9 @@ limitations under the License.
  <uses-feature
    android:name="android.hardware.bluetooth"
    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.camera"
+    android:required="false" />
  <uses-feature
    android:name="android.hardware.faketouch"
    android:required="false" />
@@ -136,9 +141,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/ThemeMyTracks" >
    <!-- For data backup -->
    <meta-data
      android:name="com.google.android.backup.api_key"
@@ -151,10 +156,11 @@ 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" />
-    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity" >
+    <activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity" >
      <intent-filter>
        <action android:name="android.intent.action.ATTACH_DATA" />
        <action android:name="android.intent.action.VIEW" />
@@ -169,7 +175,9 @@ limitations under the License.
    </activity>
    <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" >
+    <activity
+      android:label="@string/menu_markers"
+      android:name="com.google.android.apps.mytracks.MarkerListActivity" >
      <meta-data
        android:name="android.app.default_searchable"
        android:value="com.google.android.apps.mytracks.SearchListActivity" />
@@ -187,7 +195,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>
@@ -198,26 +212,18 @@ limitations under the License.
        android:name="android.app.default_searchable"
        android:value="com.google.android.apps.mytracks.SearchListActivity" />
    </activity>
-    <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.drive.SendDriveActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.file.exporter.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" />
-    <activity android:name="com.google.android.apps.mytracks.settings.BackupResetSettingsActivity" />
+    <activity android:name="com.google.android.apps.mytracks.settings.AdvancedSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.ChartSettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.GoogleSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.MapSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.RecordingSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.SensorSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.SettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.SharingSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.StatsSettingsActivity" />
    <activity
      android:label="@string/track_widget_config_title"
@@ -237,14 +243,15 @@ 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" />
-    <service android:name="com.google.android.apps.mytracks.services.RemoveTempFilesService" />
    <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" />
@@ -272,6 +279,7 @@ limitations under the License.
    <provider
      android:authorities="com.google.android.maps.mytracks"
      android:exported="true"
+      android:grantUriPermissions="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" />
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2012 Google Inc.
+Copyright 2013 Google Inc.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,14 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView">
-  <TableLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:padding="8dp"
-    android:shrinkColumns="0,2"
-    android:stretchColumns="0,2" >
-    <include layout="@layout/stats_core" />
-  </TableLayout>
-</ScrollView>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+  android:duration="1000"
+  android:fromAlpha="1.0"
+  android:interpolator="@android:anim/linear_interpolator"
+  android:toAlpha="0.0" />
--- a/Show More
+++ b/Show More