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

Remove share track setting.

Browse Source
This commit is contained in:
Jimmy Shih
2013-06-04 16:36:55 -07:00
parent 2e81f981ca
commit 864129488f
10 changed files with 4 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/arrays_do_not_translate.xml
-8
View File
@@ -182,14 +182,6 @@ limitations under the License.
<item>@string/sensor_type_value_zephyr</item>
<item>@string/sensor_type_value_none</item>
</string-array>
<string-array name="share_track_options">
<item>@string/settings_sharing_share_track_drive</item>
<item>@string/settings_sharing_share_track_maps</item>
</string-array>
<string-array name="share_track_values">
<item>@string/settings_sharing_share_track_drive_value</item>
<item>@string/settings_sharing_share_track_maps_value</item>
</string-array>
<string-array name="track_color_mode_options">
<item>@string/settings_map_track_color_mode_single</item>
<item>@string/settings_map_track_color_mode_fixed</item>
MyTracks/res/values/do_not_translate.xml
-3
View File
@@ -74,7 +74,6 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
<string name="export_google_fusion_tables_url">google.com/fusiontables</string>
<string name="export_google_maps_url">maps.google.com</string>
<string name="export_google_spreadsheets_url">drive.google.com</string>
<string name="maps_public_unlisted_url">support.google.com/maps/bin/answer.py?answer=144365</string>
<string name="marker_statistics_icon_url">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
<string name="marker_waypoint_icon_url">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
<string name="my_tracks_help_url">http://support.google.com/gmm/bin/topic.py?topic=2391064&amp;hl=%1$s</string>
@@ -94,8 +93,6 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
<string name="settings_recording_track_name_date_local_value">DATE_LOCAL</string>
<string name="settings_recording_track_name_location_value">LOCATION</string>
<string name="settings_recording_track_name_number_value">NUMBER</string>
<string name="settings_sharing_share_track_drive_value">DRIVE</string>
<string name="settings_sharing_share_track_maps_value">MAPS</string>
<string name="track_action_end">com.google.android.apps.mytracks.END_CURRENT_TRACK</string>
<string name="track_action_pause">com.google.android.apps.mytracks.PAUSE_CURRENT_TRACK</string>
<string name="track_action_resume">com.google.android.apps.mytracks.RESUME_CURRENT_TRACK</string>
MyTracks/res/values/keys.xml
-3
View File
@@ -37,7 +37,6 @@ limitations under the License.
<string name="min_required_accuracy_key">minRequiredAccuracy</string>
<string name="report_speed_key">reportSpeed</string>
<string name="sensor_type_key">sensorType</string>
<string name="share_track_key">shareTrack</string>
<string name="split_frequency_key">splitFrequency</string>
<string name="stats_show_coordinate_key">statsShowCoordinate</string>
<string name="stats_show_grade_elevation_key">statsShowGradeElevation</string>
@@ -61,8 +60,6 @@ limitations under the License.
<string name="bluetooth_sensor_key">bluetoothSensor</string>
<string name="confirm_play_earth_key">confirmPlayEarth</string>
<string name="confirm_share_drive_key">confirmShareDrive</string>
<string name="confirm_share_file_key">confirmShareFile</string>
<string name="confirm_share_maps_key">confirmShareMaps</string>
<string name="drive_deleted_list_key">driveDeletedList</string>
<string name="drive_largest_change_id_key">driveLargestChangeId</string>
<string name="drive_sync_key">driveSync</string>
MyTracks/res/values/strings.xml
-37
View File
@@ -1959,30 +1959,6 @@ limitations under the License.
Tracks data.">
Other apps can read, write, start/stop recording My Tracks data.
</string>
<string name="settings_sharing_share_track"
translation_description="In the 'Sharing' settings, the option to configure how to share a
track.
Character limit: ~23 (1 line)">
Share track
</string>
<string name="settings_sharing_share_track_drive"
translation_description="In the 'Sharing' settings, the option in the 'Share track' setting to
share via Google Drive.">
Via Google Drive
</string>
<string name="settings_sharing_share_track_file"
translation_description="In the 'Sharing' settings, the option in the 'Share track' setting to
share as a file.
%1$s: file format. E.g., 'GPX'.">
As %1$s file
</string>
<string name="settings_sharing_share_track_maps"
translation_description="In the 'Sharing' settings, the option in the 'Share track' setting to
share via Google Maps url.">
Via Google Maps url
</string>
<!-- Settings Stats -->
<string name="settings_stats_coordinate"
@@ -2039,19 +2015,6 @@ limitations under the License.
This will upload your track to Google Drive so you can share the file with friends. The file
will be private and only those you have shared with will have access.
</string>
<string name="share_track_file_confirm_message"
translation_description="The confirmation message when sharing a track as a file.">
This will save your track to external storage so you can share the file.
</string>
<string name="share_track_maps_confirm_message"
translation_description="The confirmation message when sharing a track via Google Maps with
friends.
%1$s url. E.g., 'support.google.com/maps/bin/answer.py?answer=144365'.">
This will upload your track to Google Maps so you can share the map url with friends. The map
will be either public or unlisted depending on your setting at Settings -> Google. For more info
on public versus unlisted, see %1$s.
</string>
<string name="share_track_picker_title"
translation_description="When sharing a track with friends, the title on the picker to ask the
user to select an application.">
MyTracks/res/xml/sharing_settings.xml
-4
View File
@@ -16,10 +16,6 @@ limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/settings_sharing" >
<ListPreference
android:defaultValue="@string/settings_sharing_share_track_drive_value"
android:key="@string/share_track_key"
android:title="@string/settings_sharing_share_track" />
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/allow_access_key"
MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
+4 -48
View File
@@ -42,7 +42,6 @@ import com.google.android.apps.mytracks.util.AnalyticsUtils;
import com.google.android.apps.mytracks.util.GoogleEarthUtils;
import com.google.android.apps.mytracks.util.IntentUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.maps.mytracks.R;
import android.accounts.Account;
@@ -361,27 +360,10 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
* @param trackId the track id
*/
protected void confirmShare(long trackId) {
String shareTrack = PreferencesUtils.getString(
this, R.string.share_track_key, PreferencesUtils.SHARE_TRACK_DEFAULT);
String driveValue = getString(R.string.settings_sharing_share_track_drive_value);
String mapsValue = getString(R.string.settings_sharing_share_track_maps_value);
if (shareTrack.equals(driveValue)) {
ConfirmDialogFragment.newInstance(R.string.confirm_share_drive_key,
PreferencesUtils.CONFIRM_SHARE_DRIVE_DEFAULT,
getString(R.string.share_track_drive_confirm_message), new long[] { trackId })
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
} else if (shareTrack.equals(mapsValue)) {
ConfirmDialogFragment.newInstance(R.string.confirm_share_maps_key,
PreferencesUtils.CONFIRM_SHARE_MAPS_DEFAULT, StringUtils.getHtml(
this, R.string.share_track_maps_confirm_message, R.string.maps_public_unlisted_url),
new long[] { trackId })
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
} else {
ConfirmDialogFragment.newInstance(R.string.confirm_share_file_key,
PreferencesUtils.CONFIRM_SHARE_FILE_DEFAULT,
getString(R.string.share_track_file_confirm_message), new long[] { trackId })
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
}
ConfirmDialogFragment.newInstance(R.string.confirm_share_drive_key,
PreferencesUtils.CONFIRM_SHARE_DRIVE_DEFAULT,
getString(R.string.share_track_drive_confirm_message), new long[] { trackId })
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
}
@Override
@@ -405,32 +387,6 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
newRequest.setDriveShare(true);
sendToGoogle(newRequest);
break;
case R.string.confirm_share_maps_key:
AnalyticsUtils.sendPageViews(this, "/action/share_maps");
newRequest = new SendRequest(trackIds[0]);
newRequest.setSendMaps(true);
newRequest.setMapsShare(true);
sendToGoogle(newRequest);
break;
case R.string.confirm_share_file_key:
String shareTrack = PreferencesUtils.getString(
this, R.string.share_track_key, PreferencesUtils.SHARE_TRACK_DEFAULT);
TrackFileFormat trackFileFormat;
if (shareTrack.equals(TrackFileFormat.GPX.name())) {
trackFileFormat = TrackFileFormat.GPX;
} else if (shareTrack.equals(TrackFileFormat.KML.name())) {
trackFileFormat = TrackFileFormat.KML;
} else if (shareTrack.equals(TrackFileFormat.CSV.name())) {
trackFileFormat = TrackFileFormat.CSV;
} else {
trackFileFormat = TrackFileFormat.TCX;
}
intent = IntentUtils.newIntent(this, SaveActivity.class)
.putExtra(SaveActivity.EXTRA_TRACK_IDS, trackIds)
.putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat)
.putExtra(SaveActivity.EXTRA_SHARE_TRACK, true);
startActivity(intent);
break;
default:
}
}
MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java
-2
View File
@@ -53,8 +53,6 @@ public class PreferenceBackupHelper {
doNotBackup.add(context.getString(R.string.bluetooth_sensor_key));
doNotBackup.add(context.getString(R.string.confirm_play_earth_key));
doNotBackup.add(context.getString(R.string.confirm_share_drive_key));
doNotBackup.add(context.getString(R.string.confirm_share_file_key));
doNotBackup.add(context.getString(R.string.confirm_share_maps_key));
doNotBackup.add(context.getString(R.string.drive_deleted_list_key));
doNotBackup.add(context.getString(R.string.drive_largest_change_id_key));
doNotBackup.add(context.getString(R.string.drive_sync_key));
MyTracks/src/com/google/android/apps/mytracks/settings/SharingSettingsActivity.java
-27
View File
@@ -17,20 +17,15 @@
package com.google.android.apps.mytracks.settings;
import com.google.android.apps.mytracks.util.DialogUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.maps.mytracks.R;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
/**
* An activity for accessing the sharing settings.
*
@@ -40,7 +35,6 @@ public class SharingSettingsActivity extends AbstractSettingsActivity {
private static final int DIALOG_CONFIRM_ALLOW_ACCESS_ID = 0;
private ListPreference shareTrackListPreference;
private CheckBoxPreference allowAccessCheckBoxPreference;
@SuppressWarnings("deprecation")
@@ -49,27 +43,6 @@ public class SharingSettingsActivity extends AbstractSettingsActivity {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.sharing_settings);
shareTrackListPreference = (ListPreference) findPreference(getString(R.string.share_track_key));
String value = PreferencesUtils.getString(
this, R.string.share_track_key, PreferencesUtils.SHARE_TRACK_DEFAULT);
String fileTypes[] = getResources().getStringArray(R.array.file_types);
ArrayList<String> shareTrackValues = new ArrayList<String>(
Arrays.asList(getResources().getStringArray(R.array.share_track_values)));
for (String fileType : fileTypes) {
shareTrackValues.add(fileType);
}
String[] values = shareTrackValues.toArray(new String[shareTrackValues.size()]);
ArrayList<String> shareTrackOptions = new ArrayList<String>(
Arrays.asList(getResources().getStringArray(R.array.share_track_options)));
for (String fileType : fileTypes) {
shareTrackOptions.add(getString(R.string.settings_sharing_share_track_file, fileType));
}
String[] options = shareTrackOptions.toArray(new String[shareTrackOptions.size()]);
configureListPreference(shareTrackListPreference, options, options, values, value, null);
allowAccessCheckBoxPreference = (CheckBoxPreference) findPreference(
getString(R.string.allow_access_key));
allowAccessCheckBoxPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
-3
View File
@@ -57,8 +57,6 @@ public class PreferencesUtils {
public static final boolean CONFIRM_PLAY_EARTH_DEFAULT = true;
public static final boolean CONFIRM_SHARE_DRIVE_DEFAULT = true;
public static final boolean CONFIRM_SHARE_FILE_DEFAULT = true;
public static final boolean CONFIRM_SHARE_MAPS_DEFAULT = true;
public static final String DEFAULT_ACTIVITY_DEFAULT = "";
public static final String DRIVE_DELETED_LIST_DEFAULT = "";
@@ -97,7 +95,6 @@ public class PreferencesUtils {
public static final long SELECTED_TRACK_ID_DEFAULT = -1L;
public static final String SENSOR_TYPE_DEFAULT = "NONE";
public static final String SHARE_TRACK_DEFAULT = "DRIVE";
public static final int SPLIT_FREQUENCY_DEFAULT = 0;
public static final boolean STATS_SHOW_COORDINATE_DEFAULT = false;
public static final boolean STATS_SHOW_GRADE_ELEVATION_DEFAULT = false;
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java
-149
View File
@@ -17,19 +17,13 @@ package com.google.android.apps.mytracks.endtoendtest.common;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.apps.mytracks.endtoendtest.EndToEndTestUtils;
import com.google.android.apps.mytracks.endtoendtest.GoogleUtils;
import com.google.android.apps.mytracks.endtoendtest.sync.SyncTestUtils;
import com.google.android.gms.auth.GoogleAuthException;
import com.google.android.maps.mytracks.R;
import com.google.api.services.drive.Drive;
import android.app.Instrumentation;
import android.content.Intent;
import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
import android.view.View;
import java.io.IOException;
import java.util.ArrayList;
/**
@@ -116,149 +110,6 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
return activityMyTracks.findViewById(R.id.track_controler_container).isShown();
}
/**
* Tests sharing a track with Google Drive.
*
* @throws GoogleAuthException
* @throws IOException
*/
public void testShareActivity_withDrive() throws IOException, GoogleAuthException {
// Prepare test environment.
SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_1);
Drive drive1 = SyncTestUtils.getGoogleDrive(EndToEndTestUtils.activityMytracks
.getApplicationContext());
SyncTestUtils.removeKMLFiles(drive1);
EndToEndTestUtils.deleteAllTracks();
SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_2);
Drive drive2 = SyncTestUtils.getGoogleDrive(EndToEndTestUtils.activityMytracks
.getApplicationContext());
SyncTestUtils.removeKMLFiles(drive2);
EndToEndTestUtils.deleteAllTracks();
EndToEndTestUtils.resetAllSettings(activityMyTracks, false);
EndToEndTestUtils.createSimpleTrack(0, false);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_sharing));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
.getString(R.string.settings_sharing_share_track));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
.getString(R.string.settings_sharing_share_track_drive));
EndToEndTestUtils.SOLO.goBack();
EndToEndTestUtils.SOLO.goBack();
// Click share, check message and cancel the share.
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.share_track_drive_confirm_message)));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_no));
assertFalse(EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.share_track_add_emails_title), 1,
EndToEndTestUtils.VERY_SHORT_WAIT_TIME));
// Click share again and confirm the share.
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_yes));
boolean isAccount2Bound = false;
// If Choose account dialog prompt, choose the first account.
if (EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.send_google_choose_account_title), 1,
EndToEndTestUtils.SHORT_WAIT_TIME)) {
// Whether can found account2.
if (EndToEndTestUtils.SOLO.waitForText(GoogleUtils.ACCOUNT_NAME_2, 1,
EndToEndTestUtils.VERY_SHORT_WAIT_TIME)) {
isAccount2Bound = true;
}
EndToEndTestUtils.SOLO.clickOnText(GoogleUtils.ACCOUNT_NAME_1);
EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true,
true);
}
// Input account to share and click OK button.
assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.share_track_add_emails_title)));
EndToEndTestUtils.enterTextAvoidSoftKeyBoard(0, GoogleUtils.ACCOUNT_NAME_2);
EndToEndTestUtils
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
// Waiting the send is finish.
while (EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.generic_progress_title), 1,
EndToEndTestUtils.SHORT_WAIT_TIME)) {}
assertTrue(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.SOLO
.getString(R.string.generic_success_title)));
EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.SOLO.getString(R.string.generic_ok));
// Make more checks if the second account is also bound with this device.
if (isAccount2Bound) {
EndToEndTestUtils.SOLO.goBack();
SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_2);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
assertTrue(EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.track_list_shared_with_me), 1,
EndToEndTestUtils.SUPER_LONG_WAIT_TIME));
assertTrue(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.trackName, 1,
EndToEndTestUtils.SUPER_LONG_WAIT_TIME));
}
}
/**
* Tests the share a track with Google Maps.
*/
public void testShareActivity_withMaps() {
EndToEndTestUtils.createTrackIfEmpty(0, false);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_sharing));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
.getString(R.string.settings_sharing_share_track));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
.getString(R.string.settings_sharing_share_track_maps));
EndToEndTestUtils.SOLO.goBack();
EndToEndTestUtils.SOLO.goBack();
// Click share, check message and cancel the share.
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(
R.string.share_track_maps_confirm_message).split("\\%")[0]));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_no));
assertFalse(EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.share_track_add_emails_title), 1,
EndToEndTestUtils.VERY_SHORT_WAIT_TIME));
// Try all share items.
for (int i = 0;; i++) {
EndToEndTestUtils.createTrackIfEmpty(0, false);
View oneItemView = findShareItem(i);
if (oneItemView == null) {
break;
}
EndToEndTestUtils.SOLO.clickOnView(oneItemView);
EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true,
true);
if (!GoogleUtils.isAccountAvailable()) {
break;
}
// Waiting the send is finish.
while (EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.generic_progress_title), 1,
EndToEndTestUtils.SHORT_WAIT_TIME)) {}
// Check whether data is correct on Google Map and then delete it.
assertTrue(GoogleUtils.deleteMap(EndToEndTestUtils.trackName, activityMyTracks));
// Display the MyTracks activity for the share item may startup other
// applications.
Intent intent = new Intent();
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(activityMyTracks.getApplicationContext(), TrackListActivity.class);
activityMyTracks.getApplicationContext().startActivity(intent);
EndToEndTestUtils.sleep(EndToEndTestUtils.NORMAL_WAIT_TIME);
}
}
/**
* Gets the view to click the share item by item index.
*