From c3912042e95443149faafb064e0595c484996f59 Mon Sep 17 00:00:00 2001 From: Rodrigo Damazio Date: Mon, 2 Jan 2012 19:03:07 -0200 Subject: [PATCH] Merge to head --- MyTracks/AndroidManifest.xml | 6 +- MyTracks/project.properties | 2 +- MyTracks/res/drawable/x_axis.png | Bin 279 -> 286 bytes MyTracks/res/drawable/y_axis.png | Bin 274 -> 275 bytes MyTracks/res/layout/about.xml | 159 +++--- MyTracks/res/layout/chart_settings.xml | 182 +++---- MyTracks/res/layout/mytracks_detail.xml | 83 --- .../res/layout/mytracks_send_to_google.xml | 2 +- MyTracks/res/layout/sensor_state.xml | 186 ++----- MyTracks/res/layout/track_detail.xml | 112 ++++ MyTracks/res/values-ar/strings.xml | 11 + MyTracks/res/values-bg/strings.xml | 24 + MyTracks/res/values-ca/strings.xml | 228 +------- MyTracks/res/values-cs/strings.xml | 25 + MyTracks/res/values-da/strings.xml | 3 + MyTracks/res/values-de-rAT/strings.xml | 3 + MyTracks/res/values-de-rCH/strings.xml | 3 + MyTracks/res/values-de/strings.xml | 217 +------- MyTracks/res/values-el/strings.xml | 3 + MyTracks/res/values-en-rGB/strings.xml | 6 + MyTracks/res/values-en-rIE/strings.xml | 6 + MyTracks/res/values-en-rIN/strings.xml | 6 + MyTracks/res/values-en-rSG/strings.xml | 6 + MyTracks/res/values-en-rZA/strings.xml | 6 + MyTracks/res/values-es-rAR/strings.xml | 3 + MyTracks/res/values-es-rBO/strings.xml | 3 + MyTracks/res/values-es-rCL/strings.xml | 3 + MyTracks/res/values-es-rCO/strings.xml | 3 + MyTracks/res/values-es-rCR/strings.xml | 3 + MyTracks/res/values-es-rDO/strings.xml | 3 + MyTracks/res/values-es-rEC/strings.xml | 3 + MyTracks/res/values-es-rES/strings.xml | 35 -- MyTracks/res/values-es-rGT/strings.xml | 3 + MyTracks/res/values-es-rHN/strings.xml | 3 + MyTracks/res/values-es-rMX/strings.xml | 3 + MyTracks/res/values-es-rNI/strings.xml | 3 + MyTracks/res/values-es-rPA/strings.xml | 3 + MyTracks/res/values-es-rPE/strings.xml | 3 + MyTracks/res/values-es-rPR/strings.xml | 3 + MyTracks/res/values-es-rPY/strings.xml | 3 + MyTracks/res/values-es-rSV/strings.xml | 3 + MyTracks/res/values-es-rUS/strings.xml | 3 + MyTracks/res/values-es-rUY/strings.xml | 3 + MyTracks/res/values-es-rVE/strings.xml | 3 + MyTracks/res/values-es/strings.xml | 296 ++-------- MyTracks/res/values-et/strings.xml | 3 + MyTracks/res/values-eu/strings.xml | 24 + MyTracks/res/values-fa/strings.xml | 3 + MyTracks/res/values-fi/strings.xml | 279 +--------- MyTracks/res/values-fr-rCA/strings.xml | 3 + MyTracks/res/values-fr-rCH/strings.xml | 3 + MyTracks/res/values-fr/strings.xml | 207 +------ MyTracks/res/values-gl/strings.xml | 3 + MyTracks/res/values-he/strings.xml | 3 + MyTracks/res/values-hi/strings.xml | 3 + MyTracks/res/values-hr/strings.xml | 24 + MyTracks/res/values-hu/strings.xml | 3 + MyTracks/res/values-id/strings.xml | 3 + MyTracks/res/values-in/strings.xml | 3 + MyTracks/res/values-it/strings.xml | 229 ++------ MyTracks/res/values-iw/strings.xml | 3 + MyTracks/res/values-ja/strings.xml | 234 +------- MyTracks/res/values-ko/strings.xml | 4 + MyTracks/res/values-ln/strings.xml | 3 + MyTracks/res/values-lt/strings.xml | 17 + MyTracks/res/values-lv/strings.xml | 26 + MyTracks/res/values-mo/strings.xml | 25 + MyTracks/res/values-ms/strings.xml | 28 + MyTracks/res/values-nb/strings.xml | 30 ++ MyTracks/res/values-nl/strings.xml | 3 + MyTracks/res/values-pl/strings.xml | 208 +------ MyTracks/res/values-pt-rBR/strings.xml | 196 ++----- MyTracks/res/values-pt-rPT/strings.xml | 3 + MyTracks/res/values-pt/strings.xml | 31 ++ MyTracks/res/values-ro/strings.xml | 25 + MyTracks/res/values-ru/strings.xml | 254 +-------- MyTracks/res/values-sk/strings.xml | 26 + MyTracks/res/values-sl/strings.xml | 3 + MyTracks/res/values-sr/strings.xml | 25 + MyTracks/res/values-sv/strings.xml | 178 +----- MyTracks/res/values-th/strings.xml | 3 + MyTracks/res/values-tl/strings.xml | 26 + MyTracks/res/values-tr/strings.xml | 25 + MyTracks/res/values-uk/strings.xml | 3 + MyTracks/res/values-vi/strings.xml | 3 + MyTracks/res/values-zh-rCN/strings.xml | 235 +------- MyTracks/res/values-zh-rHK/strings.xml | 3 + MyTracks/res/values-zh-rTW/strings.xml | 3 + MyTracks/res/values-zh/strings.xml | 3 + MyTracks/res/values/do_not_translate.xml | 4 +- MyTracks/res/values/strings.xml | 508 ++++++++---------- MyTracks/res/values/styles.xml | 121 +++-- MyTracks/res/xml/preferences.xml | 54 +- .../android/apps/mytracks/ChartActivity.java | 48 +- .../apps/mytracks/ChartSettingsDialog.java | 9 + .../android/apps/mytracks/ChartView.java | 2 +- .../apps/mytracks/ImportAllTracks.java | 13 +- .../android/apps/mytracks/MapActivity.java | 5 +- .../android/apps/mytracks/MyTracks.java | 8 +- .../apps/mytracks/SensorStateActivity.java | 140 +++-- .../android/apps/mytracks/StatsActivity.java | 25 +- .../android/apps/mytracks/TrackDetail.java | 119 ++++ .../android/apps/mytracks/TrackDetails.java | 124 ----- .../android/apps/mytracks/TrackList.java | 6 +- .../android/apps/mytracks/WaypointsList.java | 12 +- .../apps/mytracks/WelcomeActivity.java | 3 +- .../io/backup/BackupActivityHelper.java | 8 +- .../apps/mytracks/io/docs/DocsHelper.java | 17 +- .../io/sendtogoogle/SendActivity.java | 16 +- .../mytracks/io/sendtogoogle/SendDialog.java | 41 +- .../maps/DynamicSpeedTrackPathDescriptor.java | 32 +- .../maps/FixedSpeedTrackPathDescriptor.java | 29 +- .../services/DefaultTrackNameFactory.java | 7 +- .../sensors/BluetoothSensorManager.java | 4 +- .../services/sensors/SensorUtils.java | 2 +- .../android/apps/mytracks/util/EulaUtil.java | 35 +- .../apps/mytracks/util/StringUtils.java | 15 +- MyTracksApiSample/project.properties | 2 +- MyTracksLib/project.properties | 2 +- MyTracksTest/project.properties | 2 +- .../android/apps/mytracks/MyTracksTest.java | 6 +- .../io/docs/DocsHelper_AddTrackRowTest.java | 9 +- .../services/DefaultTrackNameFactoryTest.java | 9 +- SignalStrengthSampler/project.properties | 2 +- SignalStrengthSamplerTest/project.properties | 2 +- 125 files changed, 1852 insertions(+), 3675 deletions(-) delete mode 100644 MyTracks/res/layout/mytracks_detail.xml create mode 100644 MyTracks/res/layout/track_detail.xml create mode 100644 MyTracks/res/values-ar/strings.xml create mode 100644 MyTracks/res/values-bg/strings.xml create mode 100644 MyTracks/res/values-cs/strings.xml create mode 100644 MyTracks/res/values-da/strings.xml create mode 100644 MyTracks/res/values-de-rAT/strings.xml create mode 100644 MyTracks/res/values-de-rCH/strings.xml create mode 100644 MyTracks/res/values-el/strings.xml create mode 100644 MyTracks/res/values-en-rGB/strings.xml create mode 100644 MyTracks/res/values-en-rIE/strings.xml create mode 100644 MyTracks/res/values-en-rIN/strings.xml create mode 100644 MyTracks/res/values-en-rSG/strings.xml create mode 100644 MyTracks/res/values-en-rZA/strings.xml create mode 100644 MyTracks/res/values-es-rAR/strings.xml create mode 100644 MyTracks/res/values-es-rBO/strings.xml create mode 100644 MyTracks/res/values-es-rCL/strings.xml create mode 100644 MyTracks/res/values-es-rCO/strings.xml create mode 100644 MyTracks/res/values-es-rCR/strings.xml create mode 100644 MyTracks/res/values-es-rDO/strings.xml create mode 100644 MyTracks/res/values-es-rEC/strings.xml delete mode 100644 MyTracks/res/values-es-rES/strings.xml create mode 100644 MyTracks/res/values-es-rGT/strings.xml create mode 100644 MyTracks/res/values-es-rHN/strings.xml create mode 100644 MyTracks/res/values-es-rMX/strings.xml create mode 100644 MyTracks/res/values-es-rNI/strings.xml create mode 100644 MyTracks/res/values-es-rPA/strings.xml create mode 100644 MyTracks/res/values-es-rPE/strings.xml create mode 100644 MyTracks/res/values-es-rPR/strings.xml create mode 100644 MyTracks/res/values-es-rPY/strings.xml create mode 100644 MyTracks/res/values-es-rSV/strings.xml create mode 100644 MyTracks/res/values-es-rUS/strings.xml create mode 100644 MyTracks/res/values-es-rUY/strings.xml create mode 100644 MyTracks/res/values-es-rVE/strings.xml create mode 100644 MyTracks/res/values-et/strings.xml create mode 100644 MyTracks/res/values-eu/strings.xml create mode 100644 MyTracks/res/values-fa/strings.xml create mode 100644 MyTracks/res/values-fr-rCA/strings.xml create mode 100644 MyTracks/res/values-fr-rCH/strings.xml create mode 100644 MyTracks/res/values-gl/strings.xml create mode 100644 MyTracks/res/values-he/strings.xml create mode 100644 MyTracks/res/values-hi/strings.xml create mode 100644 MyTracks/res/values-hr/strings.xml create mode 100644 MyTracks/res/values-hu/strings.xml create mode 100644 MyTracks/res/values-id/strings.xml create mode 100644 MyTracks/res/values-in/strings.xml create mode 100644 MyTracks/res/values-iw/strings.xml create mode 100644 MyTracks/res/values-ko/strings.xml create mode 100644 MyTracks/res/values-ln/strings.xml create mode 100644 MyTracks/res/values-lt/strings.xml create mode 100644 MyTracks/res/values-lv/strings.xml create mode 100644 MyTracks/res/values-mo/strings.xml create mode 100644 MyTracks/res/values-ms/strings.xml create mode 100644 MyTracks/res/values-nb/strings.xml create mode 100644 MyTracks/res/values-nl/strings.xml create mode 100644 MyTracks/res/values-pt-rPT/strings.xml create mode 100644 MyTracks/res/values-pt/strings.xml create mode 100644 MyTracks/res/values-ro/strings.xml create mode 100644 MyTracks/res/values-sk/strings.xml create mode 100644 MyTracks/res/values-sl/strings.xml create mode 100644 MyTracks/res/values-sr/strings.xml create mode 100644 MyTracks/res/values-th/strings.xml create mode 100644 MyTracks/res/values-tl/strings.xml create mode 100644 MyTracks/res/values-tr/strings.xml create mode 100644 MyTracks/res/values-uk/strings.xml create mode 100644 MyTracks/res/values-vi/strings.xml create mode 100644 MyTracks/res/values-zh-rHK/strings.xml create mode 100644 MyTracks/res/values-zh-rTW/strings.xml create mode 100644 MyTracks/res/values-zh/strings.xml create mode 100644 MyTracks/src/com/google/android/apps/mytracks/TrackDetail.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/TrackDetails.java diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index a1e7f6695..c254bc474 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -17,8 +17,8 @@ limitations under the License. + android:versionCode="36" + android:versionName="1.1.13"> - diff --git a/MyTracks/project.properties b/MyTracks/project.properties index f4def9fb2..c946f8ad0 100644 --- a/MyTracks/project.properties +++ b/MyTracks/project.properties @@ -11,5 +11,5 @@ split.density=false proguard.config=proguard.cfg # Project target. -target=Google Inc.:Google APIs:14 +target=Google Inc.:Google APIs:15 android.library.reference.1=../MyTracksLib diff --git a/MyTracks/res/drawable/x_axis.png b/MyTracks/res/drawable/x_axis.png index e1ff47c4d0c156676b9b2b587bb0985ffb21a5a2..d7abf9a6027b8909d3dad26f3b2c77e33ddfc709 100644 GIT binary patch delta 159 zcmV;Q0AT-@0-gepS_<0?6&5890s1b&kz_G{bV)=(R5;7+k|7SlP!I*@H)%NlssdLD z7v~r_L`~C#BX9>AGBpqc243wSwPv#WvJWbiN+m%*bF)Qnwro%2`&%#HNq%7F2&H5) zEVN-}pk+$W26%8yp delta 152 zcmV;J0B8T60+#}iS_;_=4;K|3DXb+Zkz_G{ZAnByR5;7+k|7R&Knw&2l7k1JPT+Vw z&%hxt+#~n{kSvCT5DeF|otm1>w%vl`IF1QDZCxU-OWZBu?L9mws}e#`eb4ZVgJ9hm z0;}B_c4pho;w0H(5@IA0bEOSJEOZv%0Ws0j+JF1b=mMjAN4_^7_gMe{002ovPDHK) GLSTY3h(65# diff --git a/MyTracks/res/drawable/y_axis.png b/MyTracks/res/drawable/y_axis.png index 26e4656365931ba0edd575288618b3f5b54b3c8b..679025e7e7b8ff10b143ec28f6f103373a062a28 100644 GIT binary patch delta 147 zcmV;E0Brw~0+RxeS_<0?6&58eqn%%{kz_G`X-PyuR5;7+(6I@CFc<~li-itgWnt&^ zj$v;h?%)oJaCQa@A;C(>)%pGh0RZg4NtOKUT-{x=xs9!(r>aL5x3YIOw&wB4XIm-{ z@6SR=Sstt*4yXUteLbS2MF1*3RB*us7yKRnvHq)$ diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml index d50ec9442..7ff3c544b 100644 --- a/MyTracks/res/layout/about.xml +++ b/MyTracks/res/layout/about.xml @@ -17,86 +17,91 @@ limitations under the License. - + - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml index 0268b5a4b..41a864563 100644 --- a/MyTracks/res/layout/chart_settings.xml +++ b/MyTracks/res/layout/chart_settings.xml @@ -17,120 +17,90 @@ limitations under the License. - - - + android:layout_width="fill_parent" + android:shrinkColumns="0" + android:stretchColumns="0"> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical" + android:padding="10dp"> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MyTracks/res/layout/mytracks_detail.xml b/MyTracks/res/layout/mytracks_detail.xml deleted file mode 100644 index ceab4e7eb..000000000 --- a/MyTracks/res/layout/mytracks_detail.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - -