From 11972297b0ae2d3228de069a3330e4e24f517421 Mon Sep 17 00:00:00 2001 From: Rodrigo Damazio Date: Wed, 25 Jan 2012 21:01:57 -0200 Subject: [PATCH] Merge to head --- MyTracks/AndroidManifest.xml | 15 +- .../{mymaps_icon.png => maps_icon.png} | Bin MyTracks/res/layout/about.xml | 52 +- MyTracks/res/layout/choose_map.xml | 45 ++ MyTracks/res/layout/choose_map_item.xml | 47 ++ MyTracks/res/layout/list.xml | 103 --- MyTracks/res/layout/listitem.xml | 40 - .../res/layout/mytracks_send_to_google.xml | 138 ---- MyTracks/res/layout/send_to_google_result.xml | 65 -- .../send_to_google_result_list_item.xml | 49 -- MyTracks/res/layout/upload_result.xml | 143 ++++ .../res/layout/upload_service_chooser.xml | 103 +++ MyTracks/res/layout/welcome.xml | 4 +- MyTracks/res/values-de-rAT/strings.xml | 2 +- MyTracks/res/values-de-rCH/strings.xml | 2 +- MyTracks/res/values-de/strings.xml | 2 +- MyTracks/res/values-hi/strings.xml | 2 +- MyTracks/res/values-ru/strings.xml | 2 +- .../res/values/arrays_do_not_translate.xml | 12 + MyTracks/res/values/do_not_translate.xml | 8 +- MyTracks/res/values/keys.xml | 7 +- MyTracks/res/values/strings.xml | 201 ++--- MyTracks/res/values/styles.xml | 35 +- MyTracks/res/xml/preferences.xml | 12 +- .../android/apps/mytracks/AccountChooser.java | 3 + .../android/apps/mytracks/ChartActivity.java | 5 +- .../android/apps/mytracks/ChartView.java | 2 +- .../android/apps/mytracks/Constants.java | 58 +- .../apps/mytracks/ExportAllTracks.java | 2 +- .../android/apps/mytracks/MapActivity.java | 104 +-- .../android/apps/mytracks/MyMapsList.java | 175 ----- .../apps/mytracks/MyMapsListAdapter.java | 135 ---- .../apps/mytracks/SensorStateActivity.java | 6 +- .../android/apps/mytracks/StatsUtilities.java | 2 +- .../android/apps/mytracks/TrackList.java | 98 +-- .../apps/mytracks/WaypointDetails.java | 2 +- .../android/apps/mytracks/WaypointsList.java | 18 +- .../android/apps/mytracks/io/SendToDocs.java | 280 ------- .../apps/mytracks/io/SendToFusionTables.java | 728 ------------------ .../io/{SendToMyMaps.java => SendToMaps.java} | 29 +- .../io/backup/BackupActivityHelper.java | 2 +- .../apps/mytracks/io/docs/DocsHelper.java | 371 --------- .../apps/mytracks/io/docs/DocsTagBuilder.java | 118 --- .../mytracks/io/docs/SendDocsActivity.java | 134 ++++ .../mytracks/io/docs/SendDocsAsyncTask.java | 389 ++++++++++ .../apps/mytracks/io/docs/SendDocsUtils.java | 410 ++++++++++ .../mytracks/io/maps/ChooseMapActivity.java | 238 ++++++ .../mytracks/io/maps/ChooseMapAsyncTask.java | 202 +++++ .../io/{mymaps => maps}/MapFeatureEntry.java | 2 +- .../io/{mymaps => maps}/MapsClient.java | 6 +- .../MapsConstants.java} | 8 +- .../io/{mymaps => maps}/MapsFacade.java | 190 ++--- .../MapsFeature.java} | 14 +- .../MapsFeatureMetadata.java} | 8 +- .../MapsGDataConverter.java} | 36 +- .../MapsGDataWrapper.java} | 22 +- .../MapsMapMetadata.java} | 8 +- .../{mymaps => maps}/XmlMapsGDataParser.java | 2 +- .../XmlMapsGDataParserFactory.java | 2 +- .../XmlMapsGDataSerializer.java | 2 +- .../apps/mytracks/io/mymaps/GeoRect.java | 50 -- .../sendtogoogle/AccountChooserActivity.java | 169 ++++ .../io/sendtogoogle/ResultDialogFactory.java | 109 --- .../io/sendtogoogle/ResultListAdapter.java | 85 -- .../io/sendtogoogle/SendActivity.java | 687 +++++------------ .../mytracks/io/sendtogoogle/SendDialog.java | 176 ----- .../SendFusionTablesActivity.java | 146 ++++ .../SendFusionTablesAsyncTask.java | 624 +++++++++++++++ .../sendtogoogle/SendFusionTablesUtils.java | 195 +++++ .../mytracks/io/sendtogoogle/SendResult.java | 46 -- .../mytracks/io/sendtogoogle/SendType.java | 32 +- .../io/sendtogoogle/UploadResultActivity.java | 210 +++++ .../UploadServiceChooserActivity.java | 265 +++++++ .../services/DefaultTrackNameFactory.java | 53 +- .../services/TrackRecordingService.java | 2 +- .../android/apps/mytracks/util/FileUtils.java | 140 +++- .../apps/mytracks/util/StringUtils.java | 83 +- .../mytracks/widgets/TrackWidgetProvider.java | 4 +- MyTracksApiSample/AndroidManifest.xml | 2 +- MyTracksLib/AndroidManifest.xml | 2 +- MyTracksTest/AndroidManifest.xml | 2 +- .../apps/mytracks/io/docs/DocsHelperTest.java | 102 --- .../io/docs/DocsHelper_AddTrackRowTest.java | 160 ---- .../mytracks/io/docs/DocsTagBuilderTest.java | 60 -- .../mytracks/io/docs/SendDocsUtilsTest.java | 246 ++++++ .../sendtogoogle/ResultDialogFactoryTest.java | 130 ---- .../sendtogoogle/ResultListAdapterTest.java | 117 --- .../SendFusionTablesUtilsTest.java | 285 +++++++ .../services/DefaultTrackNameFactoryTest.java | 67 +- .../apps/mytracks/util/FileUtilsTest.java | 77 +- SignalStrengthSampler/AndroidManifest.xml | 2 +- SignalStrengthSamplerTest/AndroidManifest.xml | 2 +- 92 files changed, 4842 insertions(+), 4388 deletions(-) rename MyTracks/res/drawable/{mymaps_icon.png => maps_icon.png} (100%) create mode 100644 MyTracks/res/layout/choose_map.xml create mode 100644 MyTracks/res/layout/choose_map_item.xml delete mode 100644 MyTracks/res/layout/list.xml delete mode 100644 MyTracks/res/layout/listitem.xml delete mode 100644 MyTracks/res/layout/mytracks_send_to_google.xml delete mode 100644 MyTracks/res/layout/send_to_google_result.xml delete mode 100644 MyTracks/res/layout/send_to_google_result_list_item.xml create mode 100644 MyTracks/res/layout/upload_result.xml create mode 100644 MyTracks/res/layout/upload_service_chooser.xml delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/MyMapsList.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java rename MyTracks/src/com/google/android/apps/mytracks/io/{SendToMyMaps.java => SendToMaps.java} (93%) delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsTagBuilder.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsActivity.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps => maps}/MapFeatureEntry.java (93%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps => maps}/MapsClient.java (95%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps/MyMapsConstants.java => maps/MapsConstants.java} (68%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps => maps}/MapsFacade.java (60%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps/MyMapsFeature.java => maps/MapsFeature.java} (93%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps/MyMapsFeatureMetadata.java => maps/MapsFeatureMetadata.java} (90%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps/MyMapsGDataConverter.java => maps/MapsGDataConverter.java} (88%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps/MyMapsGDataWrapper.java => maps/MapsGDataWrapper.java} (89%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps/MyMapsMapMetadata.java => maps/MapsMapMetadata.java} (85%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps => maps}/XmlMapsGDataParser.java (99%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps => maps}/XmlMapsGDataParserFactory.java (98%) rename MyTracks/src/com/google/android/apps/mytracks/io/{mymaps => maps}/XmlMapsGDataSerializer.java (99%) delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/mymaps/GeoRect.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultListAdapter.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendDialog.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendFusionTablesActivity.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendFusionTablesAsyncTask.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendFusionTablesUtils.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendResult.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java delete mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelperTest.java delete mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java delete mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsTagBuilderTest.java create mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/docs/SendDocsUtilsTest.java delete mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactoryTest.java delete mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultListAdapterTest.java create mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendFusionTablesUtilsTest.java diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index b009e2245..a9982299b 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -95,7 +95,7 @@ limitations under the License. - + - @@ -167,6 +163,7 @@ limitations under the License. android:value="com.google.android.apps.mytracks.SearchActivity" /> + + + + + + + + - + - - - + + + - + - - - - - + android:layout_width="fill_parent" + android:text="@string/about_copyright_notice" + android:textSize="16sp"/> + + diff --git a/MyTracks/res/layout/choose_map.xml b/MyTracks/res/layout/choose_map.xml new file mode 100644 index 000000000..13f453177 --- /dev/null +++ b/MyTracks/res/layout/choose_map.xml @@ -0,0 +1,45 @@ + + + + + + + diff --git a/MyTracks/res/layout/choose_map_item.xml b/MyTracks/res/layout/choose_map_item.xml new file mode 100644 index 000000000..eb27429a1 --- /dev/null +++ b/MyTracks/res/layout/choose_map_item.xml @@ -0,0 +1,47 @@ + + + + + + + diff --git a/MyTracks/res/layout/list.xml b/MyTracks/res/layout/list.xml deleted file mode 100644 index b137b426d..000000000 --- a/MyTracks/res/layout/list.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/MyTracks/res/layout/listitem.xml b/MyTracks/res/layout/listitem.xml deleted file mode 100644 index 29fb1d098..000000000 --- a/MyTracks/res/layout/listitem.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml deleted file mode 100644 index 88fc3a5e9..000000000 --- a/MyTracks/res/layout/mytracks_send_to_google.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -