karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-05 11:50:27 -07:00
parent 1911187450
commit 014e5257d0
6 changed files with 181 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/AndroidManifest.xml
+2 -2
View File
@@ -248,8 +248,8 @@ limitations under the License.
<!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. --> <!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
<permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" <permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
android:permissionGroup="android.permission-group.LOCATION" android:permissionGroup="android.permission-group.LOCATION"
android:label="@string/mytracks_notifications_permission_label" android:label="@string/notification_permission_label"
android:description="@string/mytracks_notifications_permission_description" android:description="@string/notification_permission_label"
android:protectionLevel="signature" /> android:protectionLevel="signature" />
<!-- We read and write raw track data, obviously. --> <!-- We read and write raw track data, obviously. -->
MyTracks/res/layout/mytracks_send_to_google.xml
-14
View File
@@ -108,20 +108,6 @@ limitations under the License.
android:text="@string/sendtogoogle_google_docs" android:text="@string/sendtogoogle_google_docs"
android:textSize="20dip" android:textSize="20dip"
android:checked="true"/> android:checked="true"/>
<RadioGroup android:id="@+id/sendtogoogle_group_docs"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone">
<RadioButton android:id="@+id/sendtogoogle_send_stats"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_send_stats"/>
<RadioButton android:id="@+id/sendtogoogle_send_stats_and_points"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_send_stats_and_points"
android:enabled="false"/>
</RadioGroup>
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>
</TableLayout> </TableLayout>
MyTracks/res/values/keys.xml
-1
View File
@@ -34,7 +34,6 @@ limitations under the License.
<string name="modular_stats_display_key">modularStatsDisplay</string> <string name="modular_stats_display_key">modularStatsDisplay</string>
<string name="pick_existing_map_key">pickExistingMap</string> <string name="pick_existing_map_key">pickExistingMap</string>
<string name="report_speed_key">reportSpeed</string> <string name="report_speed_key">reportSpeed</string>
<string name="send_stats_and_points_key">sendStatsAndPoints</string>
<string name="send_to_docs_key">sendToDocs</string> <string name="send_to_docs_key">sendToDocs</string>
<string name="send_to_fusion_tables_key">sendToFusionTables</string> <string name="send_to_fusion_tables_key">sendToFusionTables</string>
<string name="send_to_my_maps_key">sendToMyMaps</string> <string name="send_to_my_maps_key">sendToMyMaps</string>
MyTracks/res/values/strings.xml
+179 -67
View File
@@ -1422,85 +1422,197 @@ limitations under the License.
Privacy: Privacy:
</string> </string>
<!-- Send to Google --> <!-- Send to Google dialog -->
<string name="sendtogoogle_title">Send to...</string> <string name="sendtogoogle_title"
<string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string> translation_description="When sending a track to Google, the dialog title to choose the Google
<string name="sendtogoogle_google_mymaps">Google My Maps</string> services to send the track to. The user can choose Google My Maps, Google Fusion
<string name="sendtogoogle_google_docs">Google Docs</string> Tables, and Google Docs.">
<string name="sendtogoogle_send_now">Send now</string> Send to...
<string name="sendtogoogle_create_new_map">Create a new map</string> </string>
<string name="sendtogoogle_pick_existing_map">Pick an existing map</string> <string name="sendtogoogle_google_mymaps"
<string name="sendtogoogle_send_stats">Send track statistics</string> translation_description="When sending a track to Google, under the 'Send to...' dialog, the
<string name="sendtogoogle_send_stats_and_points">Send statistics and points</string> checkbox option to send to Google My Maps.">
Google My Maps
</string>
<string name="sendtogoogle_create_new_map"
translation_description="When sending a track to Google My Maps, the radio option to create a
new map as opposed to use an existing map.">
Create a new map
</string>
<string name="sendtogoogle_pick_existing_map"
translation_description="When sending a track to Google My Maps, the radio option to use an
existing map as opposed to create a new map.">
Use an existing map
</string>
<string name="sendtogoogle_google_fusiontables"
translation_description="When sending a track to Google, under the 'Send to...' dialog, the
checkbox option to send to Google Fusion Tables.">
Google Fusion Tables
</string>
<string name="sendtogoogle_google_docs"
translation_description="When sending a track to Google, under the 'Send to...' dialog, the
checkbox option to send to Google Docs.">
Google Docs
</string>
<string name="sendtogoogle_send_now"
translation_description="When sending a track to Google, under the 'Send to...' dialog, the
button on the bottom to send the track to the selected Google services.">
Send now
</string>
<!-- Getting the account to upload to. --> <!-- Getting the account to upload to. -->
<string name="no_account_found_title">No Account Found</string> <string name="choose_account_title"
<string name="no_account_found">No account found to upload tracks to.</string> translation_description="When sending to Google, the dialog title to choose a Google account.">
<string name="choose_account_title">Choose Account</string> Choose Account
</string>
<string name="no_account_found_title"
translation_description="When sending to Google, the dialog title when no Google account is
found.">
No Account Found
</string>
<string name="no_account_found"
translation_description="When sending to Google, the dialog message when no Google account is
found.">
No account found to upload tracks to.
</string>
<!-- SD card --> <!-- writing to SD card -->
<string name="io_no_external_storage_found">No external storage was found. Make sure that a SD card is inserted and that your phone is not mounted to a computer.</string> <string name="io_no_external_storage_found"
<string name="io_write_failed">Unable to write to file.</string> translation_description="When writing to the SD card, the error message when the SD card is not
<string name="io_read_failed">Unable to read from file.</string> found.">
<string name="io_create_dir_failed">Unable to create directory on SD card.</string> No external storage was found. Make sure that a SD card is inserted and that your phone is not
<string name="io_write_finished">Finished writing to SD card.</string> mounted to a computer.
<string name="io_read_finished">Finished reading from SD card.</string> </string>
<string name="io_create_dir_failed"
<!-- VersionChecker --> translation_description="When writing to the SD card, the error message when not able to create
<string name="version_check_title">Upgrade Check</string> a directory on the SD card.">
<string name="version_check_upgrade_button">Upgrade Now</string> Unable to create directory on SD card.
<string name="version_check_continue_button">Continue Without Upgrading</string> </string>
<string name="upgrade_required">Your version of %1$s may no longer work properly, and is no longer supported. Please upgrade in order to continue using %1$s.</string> <string name="io_write_failed"
<string name="upgrade_recommended">Your version of %1$s may no longer work properly. You may upgrade it now, or continue to use it at your own risk. Some functionality such as server synchronization may not function until you upgrade.</string> translation_description="When writing to the SD card, the error message when not able to write a
<string name="upgrade_available">A new version of %1$s is available. You may continue to use your current version without problems, but you won\'t get the latest features until you upgrade.</string> file to the SD card.">
Unable to write to file.
</string>
<string name="io_write_finished"
translation_description="When writing to the SD card, the success message when finish writing to
the SD card.">
Finished writing to SD card.
</string>
<!-- reading from SD card -->
<string name="io_read_failed"
translation_description="When reading from the SD card, the error message when not able to read
a file.">
Unable to read from file.
</string>
<string name="io_read_finished"
translation_description="When reading from the SD card, the success message when finish reading
from the SD card.">
Finished reading from SD card.
</string>
<!-- Welcome --> <!-- Welcome -->
<string name="welcome">Welcome</string> <string name="welcome"
<string name="welcome_about">About My Tracks</string> translation_description="The title of the welcome page.">
Welcome
</string>
<string name="welcome_about"
translation_description="In the 'Welcome' page, the button on the bottom to read the 'About'
page.">
About My Tracks
</string>
<!-- Announcement --> <!-- Announcement -->
<string name="announce_no_distance">My Tracks no distance</string> <string name="announce_no_distance"
<!-- Format: translation_description="For the voice announcement, the announcement when the current track's
$1 : Distance label total distance is zero.">
$2 : Distance value (5) My Tracks no distance
$3 : Distance units (mi, km) </string>
$4 : Time description (10 minutes 5 seconds) <string name="announce_template"
$5 : Speed value (5.6) : Pace value (5 minutes 6 seconds) translation_description="For the voice announcement, the template to make an announcement. E.g.,
$6 : Speed units (mph) : Pace units (per mile) 'My Tracks total distance 5.2 miles in 2 hours 30 minutes at 2.2 miles per hour'. Below is the
--> list of the parameters:
<string name="announce_template">My Tracks %1$s %2$.2f %3$s in %4$s at %5$s %6$s</string>
%1$.2f: Distance value (E.g., 5.2)
%2$s: Distance unit (miles or kilometers)
%3$s: Time value (E.g., 2 hours and 30 minutes)
%4$s: Speed value (E.g., 2.2) or pace value (E.g., 2 hours and 30 minutes)
%5$s: Speed unit (miles per hour or kilometers per hour) or pace unit (per mile or per
kilometer)">
My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s
</string>
<!-- Check Units --> <!-- Check Units -->
<string name="check_units_title">Units of Measure Notice</string> <string name="check_units_title"
<string name="check_units_message">Do you want to use metrics as your default units?</string> translation_description="The title of the dialog asking the user to confirm if he wants to use
metrics as the preferred units.">
Preferred Units
</string>
<string name="check_units_message"
translation_description="The message of the dialog asking the user to confirm if he wants to use
metrics as the preferred units.">
Do you want to use metrics as the preferred units?
</string>
<!-- Sensor State --> <!-- Sensor State page -->
<string name="sensor_data_time">Sensor Data Time</string> <string name="sensor_data_time"
<string name="power_meter_enabled">Power meter enabled</string> translation_description="In the 'Sensor State' page, the label for the last time the sensor has
<string name="heart_rate_monitor_enabled">Heart rate monitor enabled</string> sent data. E.g., 'Sensor Date Time' 10:05 am.">
<string name="no_sensor_manager">No Sensor Manager</string> Sensor Data Time
<string name="enabled">Enabled</string> </string>
<string name="connecting">Connecting</string>
<string name="connected">Connected</string>
<string name="disconnected">Disconnected</string>
<string name="no_sensor_service">No Sensor Service</string>
<string name="searching">Searching</string>
<string name="sending">Sending</string>
<!-- sensor states -->
<string name="connecting"
translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor is
connecting.">
Connecting
</string>
<string name="connected"
translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
has connected.">
Connected
</string>
<string name="disconnected"
translation_description="In the 'Sensor State' page, the 'Sensor State' value the sensor has
disconnected.">
Disconnected
</string>
<string name="sending"
translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
is sending data.">
Sending
</string>
<!-- Manifest description (not seen inside the app) --> <!-- Manifest description (not seen inside the app) -->
<string name="notification_permission_label">receive MyTracks notifications</string> <string name="notification_permission_label"
<string name="mytracks_notifications_permission_label">receive MyTracks notifications</string> translation_description="When installing a third-party app that wants to receive My Tracks
<string name="read_tracks_permission_label">read MyTracks data</string> notifications, the permission label that the Android Market shows to the user.">
<string name="write_tracks_permission_label">write data to MyTracks and start/stop MyTracks receive My Tracks notifications
recording</string> </string>
<string name="notification_permission_description">Allows the application to receive notifications <string name="notification_permission_description"
when MyTracks starts or stops a recording.</string> translation_description="When installing a third-party app that wants to receive My Tracks
<string name="mytracks_notifications_permission_description">receive MyTracks notifications notifications, the permission description that the Android Market shows to the user.">
</string> Allows the application to receive notifications when My Tracks starts or stops a recording.
<string name="read_tracks_permission_description">Allows the application to read MyTracks data. </string>
</string> <string name="read_tracks_permission_label"
<string name="write_tracks_permission_description">Allows the application to write data to translation_description="When installing a third-party app that wants to read My Tracks data,
MyTracks and start/stop MyTracks recording.</string> the permission label that the Android Market shows to the user.">
read My Tracks data
</string>
<string name="read_tracks_permission_description"
translation_description="When installing a third-party app that wants to read My Tracks data,
the permission description that the Android Market shows to the user.">
Allows the application to read My Tracks data.</string>
<string name="write_tracks_permission_label"
translation_description="When installing a third-party app that wants to write data to My
Tracks, the permission label that the Android Market shows to the user.">
write data to My Tracks and start/stop My Tracks recording
</string>
<string name="write_tracks_permission_description"
translation_description="When installing a third-party app that wants to write data to My
Tracks, the permission description that the Android Market shows to the user.">
Allows the application to write data to My Tracks and start/stop My Tracks recording.
</string>
<!-- Sensor Type Options --> <!-- Sensor Type Options -->
<string name="sensor_type_option_none" <string name="sensor_type_option_none"
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendDialog.java
-19
View File
@@ -45,7 +45,6 @@ public class SendDialog extends Dialog {
private CheckBox sendToMyMapsCheckBox; private CheckBox sendToMyMapsCheckBox;
private CheckBox sendToFusionTablesCheckBox; private CheckBox sendToFusionTablesCheckBox;
private CheckBox sendToDocsCheckBox; private CheckBox sendToDocsCheckBox;
private RadioButton sendStatsAndPointsRadioButton;
private OnClickListener clickListener; private OnClickListener clickListener;
public SendDialog(Context context) { public SendDialog(Context context) {
@@ -69,9 +68,6 @@ public class SendDialog extends Dialog {
(RadioButton) findViewById(R.id.sendtogoogle_create_new_map); (RadioButton) findViewById(R.id.sendtogoogle_create_new_map);
pickMapRadioButton = pickMapRadioButton =
(RadioButton) findViewById(R.id.sendtogoogle_pick_existing_map); (RadioButton) findViewById(R.id.sendtogoogle_pick_existing_map);
RadioButton sendStatsRadioButton = (RadioButton) findViewById(R.id.sendtogoogle_send_stats);
sendStatsAndPointsRadioButton = (RadioButton) findViewById(
R.id.sendtogoogle_send_stats_and_points);
Button cancel = (Button) findViewById(R.id.sendtogoogle_cancel); Button cancel = (Button) findViewById(R.id.sendtogoogle_cancel);
cancel.setOnClickListener(new View.OnClickListener() { cancel.setOnClickListener(new View.OnClickListener() {
@@ -124,14 +120,6 @@ public class SendDialog extends Dialog {
createNewMapRadioButton.setChecked( createNewMapRadioButton.setChecked(
!prefs.getBoolean( !prefs.getBoolean(
getContext().getString(R.string.pick_existing_map_key), false)); getContext().getString(R.string.pick_existing_map_key), false));
sendStatsAndPointsRadioButton.setChecked(
prefs.getBoolean(
getContext().getString(R.string.send_stats_and_points_key),
false));
sendStatsRadioButton.setChecked(
!prefs.getBoolean(
getContext().getString(R.string.send_stats_and_points_key),
false));
} }
} }
@@ -154,9 +142,6 @@ public class SendDialog extends Dialog {
editor.putBoolean( editor.putBoolean(
getContext().getString(R.string.pick_existing_map_key), getContext().getString(R.string.pick_existing_map_key),
pickMapRadioButton.isChecked()); pickMapRadioButton.isChecked());
editor.putBoolean(
getContext().getString(R.string.send_stats_and_points_key),
sendStatsAndPointsRadioButton.isChecked());
editor.commit(); editor.commit();
} }
} }
@@ -182,8 +167,4 @@ public class SendDialog extends Dialog {
public boolean getCreateNewMap() { public boolean getCreateNewMap() {
return createNewMapRadioButton.isChecked(); return createNewMapRadioButton.isChecked();
} }
public boolean getSendStatsAndPoints() {
return sendStatsAndPointsRadioButton.isChecked();
}
} }
MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
-1
View File
@@ -200,7 +200,6 @@ public class StatusAnnouncerTask implements PeriodicTask {
} }
return context.getString(R.string.announce_template, return context.getString(R.string.announce_template,
context.getString(R.string.total_distance_label),
d, d,
context.getString(metricUnits context.getString(metricUnits
? R.string.voice_kilometers ? R.string.voice_kilometers