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

Rename to share_maps to be consistent with send_maps.

Browse Source
This commit is contained in:
Jimmy Shih
2013-02-25 10:04:55 -08:00
parent f47ac17499
commit 6810a0d048
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/keys.xml
+1 -1
View File
@@ -31,7 +31,7 @@ limitations under the License.
<string name="chart_show_speed_key">chartShowSpeed</string> <string name="chart_show_speed_key">chartShowSpeed</string>
<string name="confirm_play_earth_key">confirmPlayEarth</string> <string name="confirm_play_earth_key">confirmPlayEarth</string>
<string name="confirm_share_drive_key">confirmShareDrive</string> <string name="confirm_share_drive_key">confirmShareDrive</string>
<string name="confirm_share_map_key">confirmShareMap</string> <string name="confirm_share_maps_key">confirmShareMaps</string>
<string name="default_activity_key">defaultActivity</string> <string name="default_activity_key">defaultActivity</string>
<string name="default_map_public_key">defaultMapPublic</string> <string name="default_map_public_key">defaultMapPublic</string>
<string name="default_table_public_key">defaultTablePublic</string> <string name="default_table_public_key">defaultTablePublic</string>
MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+4 -4
View File
@@ -355,8 +355,8 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG); .show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
return true; return true;
case R.id.track_detail_share_maps: case R.id.track_detail_share_maps:
ConfirmDialogFragment.newInstance(R.string.confirm_share_map_key, ConfirmDialogFragment.newInstance(R.string.confirm_share_maps_key,
PreferencesUtils.CONFIRM_SHARE_MAP_DEFAULT, StringUtils.getHtml( PreferencesUtils.CONFIRM_SHARE_MAPS_DEFAULT, StringUtils.getHtml(
this, R.string.share_track_maps_confirm_message, R.string.maps_public_unlisted_url), this, R.string.share_track_maps_confirm_message, R.string.maps_public_unlisted_url),
trackId).show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG); trackId).show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
return true; return true;
@@ -448,8 +448,8 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
.putExtra(SaveActivity.EXTRA_PLAY_TRACK, true); .putExtra(SaveActivity.EXTRA_PLAY_TRACK, true);
startActivity(intent); startActivity(intent);
break; break;
case R.string.confirm_share_map_key: case R.string.confirm_share_maps_key:
AnalyticsUtils.sendPageViews(this, "/action/share_map"); AnalyticsUtils.sendPageViews(this, "/action/share_maps");
sendRequest = new SendRequest(trackId); sendRequest = new SendRequest(trackId);
sendRequest.setSendMaps(true); sendRequest.setSendMaps(true);
sendRequest.setMapsShare(true); sendRequest.setMapsShare(true);
MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class PreferencesUtils {
public static final boolean CONFIRM_PLAY_EARTH_DEFAULT = true; public static final boolean CONFIRM_PLAY_EARTH_DEFAULT = true;
public static final boolean CONFIRM_SHARE_DRIVE_DEFAULT = true; public static final boolean CONFIRM_SHARE_DRIVE_DEFAULT = true;
public static final boolean CONFIRM_SHARE_MAP_DEFAULT = true; public static final boolean CONFIRM_SHARE_MAPS_DEFAULT = true;
public static final String DEFAULT_ACTIVITY_DEFAULT = ""; public static final String DEFAULT_ACTIVITY_DEFAULT = "";
public static final boolean DEFAULT_MAP_PUBLIC_DEFAULT = false; public static final boolean DEFAULT_MAP_PUBLIC_DEFAULT = false;