Merge to head

This commit is contained in:
Rodrigo Damazio
2011-12-06 16:34:48 -02:00
parent bb3a14aac0
commit ebe8cbc798
94 changed files with 2793 additions and 1892 deletions
@@ -251,6 +251,6 @@ limitations under the License.
<item>@string/waypoint_type_tunnel</item>
<item>@string/waypoint_type_waterfall</item>
<item>@string/waypoint_type_water_fountain</item>
<item>@string/waypoint_type_way_point</item>
<item>@string/waypoint_type_waypoint</item>
</string-array>
</resources>
-1
View File
@@ -32,7 +32,6 @@ limitations under the License.
http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png
</string>
<string name="my_tracks_analytics_id">UA-7222692-2</string>
<string name="my_tracks_app_name">My Tracks</string>
<string name="my_tracks_privacy_url">m.google.com/privacy</string>
<string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
<string name="my_tracks_web_url">mytracks.appspot.com</string>
+82
View File
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2011 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 License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<plurals name="importGpxFiles">
<item quantity="zero">@string/import_gpx_files_zero</item>
<item quantity="one">@string/import_gpx_files_one</item>
<item quantity="two">@string/import_gpx_files_two</item>
<item quantity="few">@string/import_gpx_files_few</item>
<item quantity="many">@string/import_gpx_files_many</item>
<item quantity="other">@string/import_gpx_files_other</item>
</plurals>
<plurals name="voiceHours">
<item quantity="zero">@string/voice_hours_zero</item>
<item quantity="one">@string/voice_hours_one</item>
<item quantity="two">@string/voice_hours_two</item>
<item quantity="few">@string/voice_hours_few</item>
<item quantity="many">@string/voice_hours_many</item>
<item quantity="other">@string/voice_hours_other</item>
</plurals>
<plurals name="voiceMinutes">
<item quantity="zero">@string/voice_minutes_zero</item>
<item quantity="one">@string/voice_minutes_one</item>
<item quantity="two">@string/voice_minutes_two</item>
<item quantity="few">@string/voice_minutes_few</item>
<item quantity="many">@string/voice_minutes_many</item>
<item quantity="other">@string/voice_minutes_other</item>
</plurals>
<plurals name="voiceSeconds">
<item quantity="zero">@string/voice_seconds_zero</item>
<item quantity="one">@string/voice_seconds_one</item>
<item quantity="two">@string/voice_seconds_two</item>
<item quantity="few">@string/voice_seconds_few</item>
<item quantity="many">@string/voice_seconds_many</item>
<item quantity="other">@string/voice_seconds_other</item>
</plurals>
<plurals name="voiceSpeedKilometersPerHour">
<item quantity="zero">@string/voice_speed_kilometers_per_hour_zero</item>
<item quantity="one">@string/voice_speed_kilometers_per_hour_one</item>
<item quantity="two">@string/voice_speed_kilometers_per_hour_two</item>
<item quantity="few">@string/voice_speed_kilometers_per_hour_few</item>
<item quantity="many">@string/voice_speed_kilometers_per_hour_many</item>
<item quantity="other">@string/voice_speed_kilometers_per_hour_other</item>
</plurals>
<plurals name="voiceSpeedMilesPerHour">
<item quantity="zero">@string/voice_speed_miles_per_hour_zero</item>
<item quantity="one">@string/voice_speed_miles_per_hour_one</item>
<item quantity="two">@string/voice_speed_miles_per_hour_two</item>
<item quantity="few">@string/voice_speed_miles_per_hour_few</item>
<item quantity="many">@string/voice_speed_miles_per_hour_many</item>
<item quantity="other">@string/voice_speed_miles_per_hour_other</item>
</plurals>
<plurals name="voiceTotalDistanceKilometers">
<item quantity="zero">@string/voice_total_distance_kilometers_zero</item>
<item quantity="one">@string/voice_total_distance_kilometers_one</item>
<item quantity="two">@string/voice_total_distance_kilometers_two</item>
<item quantity="few">@string/voice_total_distance_kilometers_few</item>
<item quantity="many">@string/voice_total_distance_kilometers_many</item>
<item quantity="other">@string/voice_total_distance_kilometers_other</item>
</plurals>
<plurals name="voiceTotalDistanceMiles">
<item quantity="zero">@string/voice_total_distance_miles_zero</item>
<item quantity="one">@string/voice_total_distance_miles_one</item>
<item quantity="two">@string/voice_total_distance_miles_two</item>
<item quantity="few">@string/voice_total_distance_miles_few</item>
<item quantity="many">@string/voice_total_distance_miles_many</item>
<item quantity="other">@string/voice_total_distance_miles_other</item>
</plurals>
</resources>
File diff suppressed because it is too large Load Diff
+96 -51
View File
@@ -15,24 +15,69 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- The style for the unit on the statistics activity. -->
<style name="StatsUnit" parent="@android:Widget.TextView">
<item name="android:gravity">bottom</item>
<!-- About dialog TableRow -->
<style name="AboutTableRow">
<item name="android:paddingBottom">2dp</item>
</style>
<!-- About dialog TextView -->
<style name="AboutTextView">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">-2dip</item>
<item name="android:layout_marginTop">-2dip</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textColor">@color/stat_label_text</item>
<item name="android:textSize">20sp</item>
</style>
<!-- The style for the unit on the statistics activity where there is only one string. -->
<style name="StatsUnitSolo" parent="@android:Widget.TextView">
<!-- About dialog TextView column 0 -->
<style name="AboutTextView.Column0">
<item name="android:gravity">right</item>
<item name="android:layout_marginBottom">-9dip</item>
<item name="android:layout_marginTop">-9dip</item>
<item name="android:textColor">@color/stat_label_text</item>
<item name="android:layout_column">0</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingRight">10dp</item>
</style>
<!-- About dialog TextView Url -->
<style name="AboutTextView.Url">
<item name="android:autoLink">web</item>
<item name="android:textSize">18sp</item>
</style>
<!-- Button -->
<style name="Button">
<item name="android:layout_height">48dip</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dip</item>
<item name="android:maxLines">2</item>
<item name="android:textSize">14dip</item>
</style>
<!-- Button layout -->
<style name="ButtonLayout">
<item name="android:background">@drawable/list_bar</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:orientation">horizontal</item>
<item name="android:paddingLeft">2dip</item>
<item name="android:paddingRight">2dip</item>
<item name="android:paddingTop">4dip</item>
</style>
<!-- Button spacer -->
<style name="ButtonSpacer">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">0.25</item>
<item name="android:layout_width">0dip</item>
<item name="android:orientation">horizontal</item>
<item name="android:visibility">gone</item>
</style>
<!-- The style for a view which divides the numerator and denominator of the units on the statistics activity. -->
<style name="StatsDivider" parent="@android:Widget.TextView">
<item name="android:background">@color/black</item>
<item name="android:layout_height">3dip</item>
<item name="android:layout_width">fill_parent</item>
</style>
<!-- The style for a text view for displaying a value on the statistics activity. -->
<style name="StatsRegister" parent="@android:Widget.TextView">
<item name="android:gravity">right</item>
@@ -67,51 +112,51 @@ limitations under the License.
<item name="android:layout_width">5dip</item>
<item name="android:textSize">40sp</item>
</style>
<!-- The style for a view which divides the numerator and denominator of the units on the statistics activity. -->
<style name="StatsDivider" parent="@android:Widget.TextView">
<item name="android:background">@color/black</item>
<item name="android:layout_height">3dip</item>
<item name="android:layout_width">fill_parent</item>
</style>
<!-- The style for the track widget. -->
<style name="WidgetText" parent="@android:Widget.TextView">
<!-- The style for the unit on the statistics activity. -->
<style name="StatsUnit" parent="@android:Widget.TextView">
<item name="android:gravity">bottom</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">-2dip</item>
<item name="android:layout_marginTop">-2dip</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textColor">@color/stat_label_text</item>
</style>
<!-- The style for the unit on the statistics activity where there is only one string. -->
<style name="StatsUnitSolo" parent="@android:Widget.TextView">
<item name="android:gravity">right</item>
<item name="android:layout_marginBottom">-9dip</item>
<item name="android:layout_marginTop">-9dip</item>
<item name="android:textColor">@color/stat_label_text</item>
</style>
<!-- Welcome page TextView -->
<style name="WelcomeTextView">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:paddingLeft">10sp</item>
<item name="android:paddingRight">10sp</item>
<item name="android:textColor">@color/black</item>
<item name="android:textSize">16sp</item>
</style>
<!-- Welcome page TextView question -->
<style name="WelcomeTextView.Question">
<item name="android:paddingTop">10sp</item>
<item name="android:textStyle">bold</item>
</style>
<!-- Widget TextView -->
<style name="WidgetTextView">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textColor">@color/appwidget_text</item>
<item name="android:textSize">14sp</item>
</style>
<style name="WidgetText.Register">
<!-- Widget TextView value -->
<style name="WidgetTextView.Value">
<item name="android:width">160px</item>
</style>
<!-- The style for the layout of the bottom buttons. -->
<style name="ButtonLayout">
<item name="android:background">@drawable/list_bar</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:orientation">horizontal</item>
<item name="android:paddingLeft">2dip</item>
<item name="android:paddingRight">2dip</item>
<item name="android:paddingTop">4dip</item>
</style>
<!-- The style for the bottom button. -->
<style name="Button">
<item name="android:layout_height">48dip</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dip</item>
<item name="android:maxLines">2</item>
<item name="android:textSize">14dip</item>
</style>
<!-- The style for the spacer on the left and right of the bottom buttons. -->
<style name="ButtonSpacer">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">0.25</item>
<item name="android:layout_width">0dip</item>
<item name="android:orientation">horizontal</item>
<item name="android:visibility">gone</item>
</style>
</resources>