From 864129488fd151b3449e8fb091c1c5b00353f228 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 4 Jun 2013 16:36:55 -0700 Subject: [PATCH] Remove share track setting. --- .../res/values/arrays_do_not_translate.xml | 8 - MyTracks/res/values/do_not_translate.xml | 3 - MyTracks/res/values/keys.xml | 3 - MyTracks/res/values/strings.xml | 37 ----- MyTracks/res/xml/sharing_settings.xml | 4 - .../AbstractSendToGoogleActivity.java | 52 +----- .../io/backup/PreferenceBackupHelper.java | 2 - .../settings/SharingSettingsActivity.java | 27 ---- .../apps/mytracks/util/PreferencesUtils.java | 3 - .../endtoendtest/common/MenuItemsTest.java | 149 ------------------ 10 files changed, 4 insertions(+), 284 deletions(-) diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml index 29dd20e7a..d97c63fbe 100644 --- a/MyTracks/res/values/arrays_do_not_translate.xml +++ b/MyTracks/res/values/arrays_do_not_translate.xml @@ -182,14 +182,6 @@ limitations under the License. @string/sensor_type_value_zephyr @string/sensor_type_value_none - - @string/settings_sharing_share_track_drive - @string/settings_sharing_share_track_maps - - - @string/settings_sharing_share_track_drive_value - @string/settings_sharing_share_track_maps_value - @string/settings_map_track_color_mode_single @string/settings_map_track_color_mode_fixed diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml index 14ad5f066..e6e45eeee 100644 --- a/MyTracks/res/values/do_not_translate.xml +++ b/MyTracks/res/values/do_not_translate.xml @@ -74,7 +74,6 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정 google.com/fusiontables maps.google.com drive.google.com - support.google.com/maps/bin/answer.py?answer=144365 http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png http://support.google.com/gmm/bin/topic.py?topic=2391064&hl=%1$s @@ -94,8 +93,6 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정 DATE_LOCAL LOCATION NUMBER - DRIVE - MAPS com.google.android.apps.mytracks.END_CURRENT_TRACK com.google.android.apps.mytracks.PAUSE_CURRENT_TRACK com.google.android.apps.mytracks.RESUME_CURRENT_TRACK diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml index dee898dae..34a85bca1 100644 --- a/MyTracks/res/values/keys.xml +++ b/MyTracks/res/values/keys.xml @@ -37,7 +37,6 @@ limitations under the License. minRequiredAccuracy reportSpeed sensorType - shareTrack splitFrequency statsShowCoordinate statsShowGradeElevation @@ -61,8 +60,6 @@ limitations under the License. bluetoothSensor confirmPlayEarth confirmShareDrive - confirmShareFile - confirmShareMaps driveDeletedList driveLargestChangeId driveSync diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index af2929998..b034cf50f 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -1959,30 +1959,6 @@ limitations under the License. Tracks data."> Other apps can read, write, start/stop recording My Tracks data. - - Share track - - - Via Google Drive - - - As %1$s file - - - Via Google Maps url - - - This will save your track to external storage so you can share the file. - - - 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. - diff --git a/MyTracks/res/xml/sharing_settings.xml b/MyTracks/res/xml/sharing_settings.xml index be9d77191..51e8ab6de 100644 --- a/MyTracks/res/xml/sharing_settings.xml +++ b/MyTracks/res/xml/sharing_settings.xml @@ -16,10 +16,6 @@ limitations under the License. --> - shareTrackValues = new ArrayList( - 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 shareTrackOptions = new ArrayList( - 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() { diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java index 84d608fd7..3decfba39 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java @@ -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; diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java index db8842dc8..9effad2bd 100644 --- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java +++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java @@ -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