From cf7be0939670776aabae2d152b96d76996827bba Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Fri, 11 Nov 2011 18:55:55 -0800 Subject: [PATCH] Clean up do_not_translate.xml Merge urls.xml into do_not_translate.xml Move my_tracks_serviec_name to strings.xml --- MyTracks/AndroidManifest.xml | 4 +- MyTracks/res/layout/about.xml | 13 ++- .../res/layout/mytracks_waypoint_details.xml | 24 +++--- MyTracks/res/layout/sensor_state.xml | 2 +- .../res/values/arrays_do_not_translate.xml | 6 +- MyTracks/res/values/do_not_translate.xml | 81 ++++++++----------- MyTracks/res/values/strings.xml | 7 ++ MyTracks/res/values/styles.xml | 2 +- MyTracks/res/values/urls.xml | 21 ----- MyTracks/res/xml/preferences.xml | 2 +- .../android/apps/mytracks/MyTracks.java | 2 +- .../apps/mytracks/SettingsActivity.java | 8 +- .../android/apps/mytracks/StatsUtilities.java | 2 +- .../apps/mytracks/io/file/SaveActivity.java | 8 +- .../io/sendtogoogle/SendActivity.java | 2 +- .../maps/TrackPathPainterFactory.java | 7 +- .../services/ControlRecordingService.java | 4 +- .../services/TrackRecordingService.java | 8 +- .../services/tasks/StatusAnnouncerTask.java | 2 +- .../apps/mytracks/util/StringUtils.java | 2 +- .../mytracks/widgets/TrackWidgetProvider.java | 8 +- .../maps/TrackPathPainterFactoryTest.java | 6 +- .../services/TrackRecordingServiceTest.java | 4 +- 23 files changed, 99 insertions(+), 126 deletions(-) delete mode 100644 MyTracks/res/values/urls.xml diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index ddac36008..91b5b142a 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -20,7 +20,7 @@ limitations under the License. android:versionCode="33" android:versionName="1.1.10"> @@ -162,7 +162,7 @@ limitations under the License. android:exported="false" /> + @@ -138,7 +143,7 @@ limitations under the License. android:autoLink="web" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:text="@string/about_privacy_weburl" + android:text="@string/my_tracks_privacy_url" android:textSize="18sp" /> diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml index 8a2811201..2c63e97ae 100644 --- a/MyTracks/res/layout/mytracks_waypoint_details.xml +++ b/MyTracks/res/layout/mytracks_waypoint_details.xml @@ -116,7 +116,7 @@ limitations under the License. android:layout_column="1" android:layout_marginBottom="-9dip" android:layout_marginTop="-9dip" - android:text="@string/unknown" + android:text="@string/value_unknown" android:textColor="@color/stat_label_text" android:textSize="40sp" /> diff --git a/MyTracks/res/layout/sensor_state.xml b/MyTracks/res/layout/sensor_state.xml index bc281ed0f..bf995f4b6 100644 --- a/MyTracks/res/layout/sensor_state.xml +++ b/MyTracks/res/layout/sensor_state.xml @@ -143,7 +143,7 @@ limitations under the License. + android:text="@string/unit_percent" /> diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml index 8aad324d5..b6cde022b 100644 --- a/MyTracks/res/values/arrays_do_not_translate.xml +++ b/MyTracks/res/values/arrays_do_not_translate.xml @@ -92,9 +92,9 @@ limitations under the License. - @string/track_color_mode_value_none - @string/track_color_mode_value_fixed - @string/track_color_mode_value_dynamic + @string/display_track_color_value_none + @string/display_track_color_value_fixed + @string/display_track_color_value_dynamic diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml index 53ad3d74d..a6a15c590 100644 --- a/MyTracks/res/values/do_not_translate.xml +++ b/MyTracks/res/values/do_not_translate.xml @@ -16,57 +16,40 @@ limitations under the License. --> - - - My Tracks - Track Recording Service - - mytracks.appspot.com - - - mytracks@googlegroups.com - m.google.com/privacy - Bartłomiej Niechwiej + Bart Niechwiej Dylan Casey - Leif Hendrik Wilden - Rodrigo Damazio Bovendorp + Jimmy Shih + Leif Wilden + Rodrigo Damazio Sandor Dornbush - - - NONE - ANT - SRM_ANT_BRIDGE - POLAR - ZEPHYR - - - NONE - FIXED - DYNAMIC - - - - - - - google.com/fusiontables - maps.google.com - docs.google.com - - - UA-7222692-2 - - - % - - - android.intent.action.SAVE - com.google.android.apps.mytracks.START_NEW_TRACK - - com.google.android.apps.mytracks.END_CURRENT_TRACK + DYNAMIC + FIXED + NONE + + http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png - - - + + http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png + + UA-7222692-2 + My Tracks + m.google.com/privacy + + mytracks.appspot.com + com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS - + docs.google.com + google.com/fusiontables + maps.google.com + ANT + NONE + POLAR + SRM_ANT_BRIDGE + ZEPHYR + com.google.android.apps.mytracks.END_CURRENT_TRACK + android.intent.action.SAVE + com.google.android.apps.mytracks.START_NEW_TRACK + % + - + diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index f5dff08ee..7480898c6 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -645,6 +645,13 @@ limitations under the License. Unlisted + + + My Tracks Service + + right -9dip -9dip - @string/unknown + @string/value_unknown @color/stat_label_text 40sp diff --git a/MyTracks/res/values/urls.xml b/MyTracks/res/values/urls.xml deleted file mode 100644 index 14ab85638..000000000 --- a/MyTracks/res/values/urls.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png - http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png - \ No newline at end of file diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml index ee9de968f..00765d88f 100644 --- a/MyTracks/res/xml/preferences.xml +++ b/MyTracks/res/xml/preferences.xml @@ -38,7 +38,7 @@ limitations under the License. android:summary="@string/settings_display_track_color_summary" android:entries="@array/display_track_color_options" android:entryValues="@array/display_track_color_values" - android:defaultValue="@string/track_color_mode_value_none"/> + android:defaultValue="@string/display_track_color_value_none"/> diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java index ad2dc8b15..6c95bedcf 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java @@ -139,7 +139,7 @@ public class MyTracks extends TabActivity implements OnTouchListener { tracker = GoogleAnalyticsTracker.getInstance(); // Start the tracker in manual dispatch mode... - tracker.start(getString(R.string.google_analytics_id), getApplicationContext()); + tracker.start(getString(R.string.my_tracks_analytics_id), getApplicationContext()); tracker.setProductVersion("android-mytracks", SystemUtils.getMyTracksVersion(this)); tracker.trackPageView("/appstart"); tracker.dispatch(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java index 78d186bda..615161fdd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java @@ -395,10 +395,10 @@ public class SettingsActivity extends PreferenceActivity { } private void updateTrackColorModeSettings(String trackColorMode) { - boolean usesFixedSpeed = trackColorMode.equals( - getString(R.string.track_color_mode_value_fixed)); - boolean usesDynamicSpeed = trackColorMode.equals( - getString(R.string.track_color_mode_value_dynamic)); + boolean usesFixedSpeed = + trackColorMode.equals(getString(R.string.display_track_color_value_fixed)); + boolean usesDynamicSpeed = + trackColorMode.equals(getString(R.string.display_track_color_value_dynamic)); findPreference(getString(R.string.track_color_mode_fixed_speed_slow_display_key)) .setEnabled(usesFixedSpeed); diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java index 77c8a1a6b..8bc0b02d9 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java +++ b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java @@ -77,7 +77,7 @@ public class StatsUtilities { } public void setUnknown(int id) { - ((TextView) activity.findViewById(id)).setText(R.string.unknown); + ((TextView) activity.findViewById(id)).setText(R.string.value_unknown); } public void setText(int id, double d, NumberFormat format) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java index 0e2533ade..c92602fda 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java @@ -74,9 +74,9 @@ public class SaveActivity extends Activity { String action = intent.getAction(); String type = intent.getType(); Uri data = intent.getData(); - if (!getString(R.string.save_intent_action).equals(action) || - !TracksColumns.CONTENT_ITEMTYPE.equals(type) || - !UriUtils.matchesContentUri(data, TracksColumns.CONTENT_URI)) { + if (!getString(R.string.track_action_save).equals(action) + || !TracksColumns.CONTENT_ITEMTYPE.equals(type) + || !UriUtils.matchesContentUri(data, TracksColumns.CONTENT_URI)) { Log.e(TAG, "Got bad save intent: " + intent); finish(); return; @@ -228,7 +228,7 @@ public class SaveActivity extends Activity { Uri uri = ContentUris.withAppendedId(TracksColumns.CONTENT_URI, trackId); Intent intent = new Intent(ctx, SaveActivity.class); - intent.setAction(ctx.getString(R.string.save_intent_action)); + intent.setAction(ctx.getString(R.string.track_action_save)); intent.setDataAndType(uri, TracksColumns.CONTENT_ITEMTYPE); intent.putExtra(EXTRA_FILE_FORMAT, exportFormat.ordinal()); intent.putExtra(EXTRA_SHARE_FILE, shareFile); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java index 7a9785382..f6d3657ad 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java @@ -163,7 +163,7 @@ public class SendActivity extends Activity implements ProgressIndicator { tracker = GoogleAnalyticsTracker.getInstance(); // Start the tracker in manual dispatch mode... - tracker.start(getString(R.string.google_analytics_id), + tracker.start(getString(R.string.my_tracks_analytics_id), getApplicationContext()); tracker.setProductVersion("android-mytracks", SystemUtils.getMyTracksVersion(this)); diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java index a287d4caa..b1cf9e97d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java @@ -49,12 +49,13 @@ public class TrackPathPainterFactory { String colorMode = prefs.getString(context.getString(R.string.track_color_mode_key), null); Log.i(TAG, "Creating track path painter of type: " + colorMode); - if (colorMode == null || colorMode.equals(context.getString(R.string.track_color_mode_value_none))) { + if (colorMode == null + || colorMode.equals(context.getString(R.string.display_track_color_value_none))) { return new SingleColorTrackPathPainter(context); - } else if (colorMode.equals(context.getString(R.string.track_color_mode_value_fixed))) { + } else if (colorMode.equals(context.getString(R.string.display_track_color_value_fixed))) { return new DynamicSpeedTrackPathPainter(context, new FixedSpeedTrackPathDescriptor(context)); - } else if (colorMode.equals(context.getString(R.string.track_color_mode_value_dynamic))) { + } else if (colorMode.equals(context.getString(R.string.display_track_color_value_dynamic))) { return new DynamicSpeedTrackPathPainter(context, new DynamicSpeedTrackPathDescriptor(context)); } else { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java index 8c8f3cc70..4232ba0d4 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java @@ -97,9 +97,9 @@ public class ControlRecordingService extends IntentService implements ServiceCon String action = intent.getAction(); if (action != null) { try { - if (action.equals(getString(R.string.start_new_track_action))) { + if (action.equals(getString(R.string.track_action_start))) { trackRecordingService.startNewTrack(); - } else if (action.equals(getString(R.string.end_current_track_action))) { + } else if (action.equals(getString(R.string.track_action_end))) { trackRecordingService.endCurrentTrack(); } } catch (RemoteException e) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java index e8d6504f2..be6418fa0 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java @@ -494,7 +494,7 @@ public class TrackRecordingService extends Service { PendingIntent contentIntent = PendingIntent.getActivity( this, 0 /* requestCode */, new Intent(this, MyTracks.class), 0 /* flags */); - notification.setLatestEventInfo(this, getString(R.string.app_name), + notification.setLatestEventInfo(this, getString(R.string.my_tracks_app_name), getString(R.string.track_record_notification), contentIntent); notification.flags += Notification.FLAG_NO_CLEAR; apiLevelAdapter.startForeground(this, notificationManager, 1, @@ -963,7 +963,7 @@ public class TrackRecordingService extends Service { private void buildMarker(Waypoint wpt, WaypointCreationRequest request) { wpt.setType(Waypoint.TYPE_WAYPOINT); if (request.getIconUrl() == null) { - wpt.setIcon(getString(R.string.waypoint_icon_url)); + wpt.setIcon(getString(R.string.marker_waypoint_icon_url)); } else { wpt.setIcon(request.getIconUrl()); } @@ -999,7 +999,7 @@ public class TrackRecordingService extends Service { waypoint.setName(getString(R.string.marker_type_statistics)); waypoint.setStatistics(waypointStatsBuilder.getStatistics()); waypoint.setDescription(utils.generateWaypointDescription(waypoint)); - waypoint.setIcon(getString(R.string.stats_icon_url)); + waypoint.setIcon(getString(R.string.marker_statistics_icon_url)); waypoint.setStartId(providerUtils.getLastLocationId(recordingTrackId)); @@ -1054,7 +1054,7 @@ public class TrackRecordingService extends Service { Intent broadcastIntent = new Intent() .setAction(getString(actionResId)) .putExtra(getString(R.string.track_id_broadcast_extra), trackId); - sendBroadcast(broadcastIntent, getString(R.string.mytracks_notifications_permission)); + sendBroadcast(broadcastIntent, getString(R.string.permission_notification_value)); SharedPreferences sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, 0); if (sharedPreferences.getBoolean(getString(R.string.allow_access_key), false)) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java index 99a6afa8f..d3b1691aa 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java @@ -188,7 +188,7 @@ public class StatusAnnouncerTask implements PeriodicTask { String speed = null; if ((s == 0) || Double.isNaN(s)) { - speed = context.getString(R.string.unknown); + speed = context.getString(R.string.value_unknown); } else { if (reportSpeed) { speed = String.format("%.1f", s); diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java index 1f49e8f98..448dda67c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java @@ -264,7 +264,7 @@ public class StringUtils implements DescriptionGenerator { minGrade = Math.round(trackMinGrade * 100); } - String category = context.getString(R.string.unknown); + String category = context.getString(R.string.value_unknown); String trackCategory = track.getCategory(); if (trackCategory != null && trackCategory.length() > 0) { category = trackCategory; diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java index 8c3c7d3a7..545d4d437 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java +++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java @@ -92,7 +92,7 @@ public class TrackWidgetProvider this.context = aContext; trackObserver = new TrackObserver(); providerUtils = MyTracksProviderUtils.Factory.get(context); - unknown = context.getString(R.string.unknown); + unknown = context.getString(R.string.value_unknown); sharedPreferences = context.getSharedPreferences(SETTINGS_NAME, 0); sharedPreferences.registerOnSharedPreferenceChangeListener(this); @@ -173,13 +173,11 @@ public class TrackWidgetProvider if (TRACK_STARTED_ACTION.equals(action)) { // If a new track is started by this appwidget or elsewhere, // toggle the button to active and have it disable the track if pressed. - setButtonIntent( - views, R.string.end_current_track_action, R.drawable.appwidget_button_enabled); + setButtonIntent(views, R.string.track_action_end, R.drawable.appwidget_button_enabled); } else { // If a track is stopped by this appwidget or elsewhere, // toggle the button to inactive and have it start a new track if pressed. - setButtonIntent( - views, R.string.start_new_track_action, R.drawable.appwidget_button_disabled); + setButtonIntent(views, R.string.track_action_start, R.drawable.appwidget_button_disabled); } } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java index 4c7d83f7b..0e654a1fa 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java @@ -46,11 +46,11 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase { return; } - testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_none, + testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_none, SingleColorTrackPathPainter.class); - testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_fixed, + testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_fixed, DynamicSpeedTrackPathPainter.class); - testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_dynamic, + testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_dynamic, DynamicSpeedTrackPathPainter.class); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java index c587d951c..d6a9ea709 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java @@ -491,7 +491,7 @@ public class TrackRecordingServiceTest assertEquals(2, service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS)); Waypoint wpt = providerUtils.getWaypoint(1); - assertEquals(getContext().getString(R.string.stats_icon_url), + assertEquals(getContext().getString(R.string.marker_statistics_icon_url), wpt.getIcon()); assertEquals(getContext().getString(R.string.marker_type_statistics), wpt.getName()); @@ -527,7 +527,7 @@ public class TrackRecordingServiceTest assertEquals(1, service.insertWaypoint(WaypointCreationRequest.DEFAULT_MARKER)); Waypoint wpt = providerUtils.getWaypoint(1); - assertEquals(getContext().getString(R.string.waypoint_icon_url), + assertEquals(getContext().getString(R.string.marker_waypoint_icon_url), wpt.getIcon()); assertEquals(getContext().getString(R.string.marker_type_waypoint), wpt.getName());