diff --git a/MyTracks/.classpath b/MyTracks/.classpath index 4a148f304..e52194c7e 100644 --- a/MyTracks/.classpath +++ b/MyTracks/.classpath @@ -16,6 +16,7 @@ - - + + + diff --git a/MyTracks/.project b/MyTracks/.project index 4ff12bb43..cf54ef5ba 100644 --- a/MyTracks/.project +++ b/MyTracks/.project @@ -1,41 +1,34 @@ - - - MyTracks - - - MyTracksLib - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - - - MyTracksLib_src - 2 - _android_MyTracksLib_e2802071/src - - - + + + MyTracks + + + MyTracksLib + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/MyTracks/default.properties b/MyTracks/project.properties similarity index 82% rename from MyTracks/default.properties rename to MyTracks/project.properties index 75e62f9cb..31e7b90c9 100644 --- a/MyTracks/default.properties +++ b/MyTracks/project.properties @@ -1,17 +1,15 @@ # This file is automatically generated by Android Tools. # Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# +# # This file must be checked in Version Control Systems. -# +# # To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your +# "ant.properties", and override values to adapt the script to your # project structure. # Indicates whether an apk should be generated for each density. split.density=false +android.library.reference.1=../MyTracksLib/ +proguard.config=proguard.cfg # Project target. target=Google Inc.:Google APIs:13 -android.library.reference.1=../MyTracksLib/ - -# Enable proguard. -proguard.config=proguard.cfg diff --git a/MyTracksApiSample/.classpath b/MyTracksApiSample/.classpath index d98e37d5d..d18e20ce7 100644 --- a/MyTracksApiSample/.classpath +++ b/MyTracksApiSample/.classpath @@ -4,6 +4,7 @@ - - + + + diff --git a/MyTracksApiSample/.project b/MyTracksApiSample/.project index f7a2037ed..e6cd087d8 100644 --- a/MyTracksApiSample/.project +++ b/MyTracksApiSample/.project @@ -30,11 +30,4 @@ com.android.ide.eclipse.adt.AndroidNature org.eclipse.jdt.core.javanature - - - MyTracksLib_src - 2 - _android_MyTracksLib_e2802071/src - - diff --git a/MyTracksApiSample/.settings/org.eclipse.jdt.core.prefs b/MyTracksApiSample/.settings/org.eclipse.jdt.core.prefs index a1c77fa36..68565ad72 100644 --- a/MyTracksApiSample/.settings/org.eclipse.jdt.core.prefs +++ b/MyTracksApiSample/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,15 @@ -#Thu Oct 13 15:26:00 PDT 2011 +#Thu Oct 20 20:36:29 BRST 2011 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +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_local_variable=569 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_member=569 diff --git a/MyTracksApiSample/default.properties b/MyTracksApiSample/project.properties similarity index 83% rename from MyTracksApiSample/default.properties rename to MyTracksApiSample/project.properties index 2a471ddd6..7b6c7b5f7 100644 --- a/MyTracksApiSample/default.properties +++ b/MyTracksApiSample/project.properties @@ -4,9 +4,9 @@ # This file must be checked in Version Control Systems. # # To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your +# "ant.properties", and override values to adapt the script to your # project structure. +android.library.reference.1=../MyTracksLib # Project target. target=Google Inc.:Google APIs:10 -android.library.reference.1=../MyTracksLib diff --git a/MyTracksLib/.classpath b/MyTracksLib/.classpath index 67679b6b2..0e5b2bd7e 100644 --- a/MyTracksLib/.classpath +++ b/MyTracksLib/.classpath @@ -4,5 +4,6 @@ - + + diff --git a/MyTracksLib/default.properties b/MyTracksLib/project.properties similarity index 81% rename from MyTracksLib/default.properties rename to MyTracksLib/project.properties index 52cb0c124..05e464d69 100644 --- a/MyTracksLib/default.properties +++ b/MyTracksLib/project.properties @@ -4,9 +4,9 @@ # This file must be checked in Version Control Systems. # # To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your +# "ant.properties", and override values to adapt the script to your # project structure. +android.library=true # Project target. target=android-13 -android.library=true diff --git a/MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java b/MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java index cf963fff7..ecb1cb629 100644 --- a/MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java +++ b/MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java @@ -1,12 +1,12 @@ /* * Copyright 2008 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -106,7 +106,7 @@ public class Track implements Parcelable { for (int i = 0; i < numberOfPoints; ++i) { dest.writeParcelable(locations.get(i), 0); } - + dest.writeString(tableId); } diff --git a/MyTracksTest/.classpath b/MyTracksTest/.classpath index 9ede41bc3..16b40eda4 100644 --- a/MyTracksTest/.classpath +++ b/MyTracksTest/.classpath @@ -11,5 +11,7 @@ - + + + diff --git a/MyTracksTest/default.properties b/MyTracksTest/project.properties similarity index 77% rename from MyTracksTest/default.properties rename to MyTracksTest/project.properties index c647beec5..5f8a5857b 100644 --- a/MyTracksTest/default.properties +++ b/MyTracksTest/project.properties @@ -1,13 +1,14 @@ # This file is automatically generated by Android Tools. # Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# +# # This file must be checked in Version Control Systems. -# +# # To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your +# "ant.properties", and override values to adapt the script to your # project structure. # Indicates whether an apk should be generated for each density. split.density=false # Project target. target=Google Inc.:Google APIs:13 +android.library.reference.1=../MyTracksLib diff --git a/SignalStrengthSampler/.classpath b/SignalStrengthSampler/.classpath index f9bca44bc..44e8b2320 100644 --- a/SignalStrengthSampler/.classpath +++ b/SignalStrengthSampler/.classpath @@ -4,6 +4,7 @@ - - + + + diff --git a/SignalStrengthSampler/.project b/SignalStrengthSampler/.project index 80fb1802d..cb1013e1b 100644 --- a/SignalStrengthSampler/.project +++ b/SignalStrengthSampler/.project @@ -30,11 +30,4 @@ com.android.ide.eclipse.adt.AndroidNature org.eclipse.jdt.core.javanature - - - MyTracksLib_src - 2 - _android_MyTracksLib_e2802071/src - - diff --git a/SignalStrengthSampler/default.properties b/SignalStrengthSampler/project.properties similarity index 83% rename from SignalStrengthSampler/default.properties rename to SignalStrengthSampler/project.properties index efb13cbcc..ae5cccb2f 100644 --- a/SignalStrengthSampler/default.properties +++ b/SignalStrengthSampler/project.properties @@ -4,10 +4,10 @@ # This file must be checked in Version Control Systems. # # To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your +# "ant.properties", and override values to adapt the script to your # project structure. +android.library.reference.1=../MyTracksLib/ +proguard.config=proguard.cfg # Project target. target=android-10 -proguard.config=proguard.cfg -android.library.reference.1=../MyTracksLib/ diff --git a/SignalStrengthSamplerTest/.classpath b/SignalStrengthSamplerTest/.classpath index e091a2041..ebd397550 100644 --- a/SignalStrengthSamplerTest/.classpath +++ b/SignalStrengthSamplerTest/.classpath @@ -5,5 +5,7 @@ - + + + diff --git a/SignalStrengthSamplerTest/default.properties b/SignalStrengthSamplerTest/project.properties similarity index 72% rename from SignalStrengthSamplerTest/default.properties rename to SignalStrengthSamplerTest/project.properties index 66db0d159..665f871dc 100644 --- a/SignalStrengthSamplerTest/default.properties +++ b/SignalStrengthSamplerTest/project.properties @@ -4,8 +4,9 @@ # This file must be checked in Version Control Systems. # # To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your +# "ant.properties", and override values to adapt the script to your # project structure. # Project target. target=android-10 +android.library.reference.1=../MyTracksLib