From 5a5b1431ebea6eb6aba547c67c83232150cf2a73 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Mon, 3 Jun 2013 17:40:15 -0700 Subject: [PATCH] Rename save all to export all. Rename save to export. Remove send to google menu option. --- .../{menu_send_google.png => menu_export.png} | Bin MyTracks/res/drawable-hdpi/menu_save.png | Bin 1429 -> 0 bytes .../{menu_send_google.png => menu_export.png} | Bin MyTracks/res/drawable-mdpi/menu_save.png | Bin 1392 -> 0 bytes .../{menu_send_google.png => menu_export.png} | Bin MyTracks/res/drawable-xhdpi/menu_save.png | Bin 1610 -> 0 bytes MyTracks/res/menu/track_detail.xml | 28 +++++------ MyTracks/res/menu/track_list.xml | 6 +-- MyTracks/res/values/strings.xml | 37 +++++---------- .../apps/mytracks/TrackDetailActivity.java | 44 +++--------------- .../apps/mytracks/TrackListActivity.java | 16 +++---- .../endtoendtest/EndToEndTestUtils.java | 4 +- .../endtoendtest/common/CreateTrackTest.java | 2 +- .../endtoendtest/common/DeleteTest.java | 2 +- .../common/ExportAndImportTest.java | 6 +-- .../endtoendtest/common/SendToGoogleTest.java | 2 +- 16 files changed, 49 insertions(+), 98 deletions(-) rename MyTracks/res/drawable-hdpi/{menu_send_google.png => menu_export.png} (100%) delete mode 100644 MyTracks/res/drawable-hdpi/menu_save.png rename MyTracks/res/drawable-mdpi/{menu_send_google.png => menu_export.png} (100%) delete mode 100644 MyTracks/res/drawable-mdpi/menu_save.png rename MyTracks/res/drawable-xhdpi/{menu_send_google.png => menu_export.png} (100%) delete mode 100644 MyTracks/res/drawable-xhdpi/menu_save.png diff --git a/MyTracks/res/drawable-hdpi/menu_send_google.png b/MyTracks/res/drawable-hdpi/menu_export.png similarity index 100% rename from MyTracks/res/drawable-hdpi/menu_send_google.png rename to MyTracks/res/drawable-hdpi/menu_export.png diff --git a/MyTracks/res/drawable-hdpi/menu_save.png b/MyTracks/res/drawable-hdpi/menu_save.png deleted file mode 100644 index 306d55a9cbb0a02909f6a3b0d910700a5aa9d5b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1429 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsViy#Ms!t#K7Ft$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1OVZUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1? zG!Lpb1-DzwaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zZoj_7f`NgF-P6S} zq~g|_nfBg?9VCtw3;hr4(sPZOGe@RG@Tg-rdtpJ*<&!u06*`)mXTOWmsAD?l|3JZ_ zqj|MLQ&WlHkxRGCde3v`E6QxU{zT7n@%Kagx0dWYUA(jU-gl{ozxPdkDp6o07uFz} zz?xzcbM&X_hEwxT=C>b|-C=g&J6i-3ZvgxB2WPi5$Zp`X`}x~KfQylJ!=e4$YBL=_ zu*m)RZFGY*z9x_HO>_BVrdbOP&E2wi*^V?ZnavGh4=g(MSy`^^xLbDn^8=GL99N}2 zEDe04`eNCB>kDs+VpSEAwBEYDDL-haxkx@%V@gNe){6@|j;?vu$aVWo+%)0H;H`Og zB&?R2eU{BBF&Ywvq+72XNTIw>Tg7x{|AnucaPmLb>6#v~~ksLl*%%M9= z>WqZM9yaAkA{XXepSLimF2d?rYwqpd3oqFGEWuS{=klxk@ei1WGOwD)WeQZOs8UkW>he( z^ikA$rT0c@o8A&X6QwrY)b+Q07OwKUE64IoW%@$DXGu~Qc3lbgEA7`}RQ)&m$i)Jw vxkk;8mc8zO)19Y%fNKNO8iu()1QQq(o>kqw__+TCsG#(8^>bP0l+XkKHLMKS diff --git a/MyTracks/res/drawable-mdpi/menu_send_google.png b/MyTracks/res/drawable-mdpi/menu_export.png similarity index 100% rename from MyTracks/res/drawable-mdpi/menu_send_google.png rename to MyTracks/res/drawable-mdpi/menu_export.png diff --git a/MyTracks/res/drawable-mdpi/menu_save.png b/MyTracks/res/drawable-mdpi/menu_save.png deleted file mode 100644 index ad076955394575364de27bf01b41b4824b002586..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1392 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsViy#Ms!t#K6ha$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1PFwUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZns$C zG!Lpb1-Dxqaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zzIe$Lm|qwldAc}; zRNQ(qeXkd@qe$!K!o^7EK6c}a?qrpVaJYU!}AHUI*slhnDTO2PQ0pi2zNTe zV)3M%nMF!KLUS?A|`Yz507-3L3kBo=kdyl;@WVxhU`d3Dz} zjW@$W995De-pr~{@csErl>bXp46k75g>>x$-7l*bJ=`RsaBO$5jllI9X-1=)8Z)k3 zQvK_GrZ%MO(I3rqCLVJax14?IxMZVCE*yh=II%alQd(@<3?15KQ zwjY0R>C&3+1m%P7D_KsQdVg^1(gvpI8^k6gR$A(qs;9mUkNj_W`?N={QKY@a)4va{ zcb+%icH>0pn&TlA+PgT9uak?<`eM7_w?o;(H~R7_zc{aXy3c-dz;`oC#hJg`7P8M$ za|rv-ca3ND0!_^hwaK~vH+Xyux4oD*_i^~Pde)wZJ+e&uT5QfeoyDQ?x$HMval*Yz zPmKQcvIpICIlw5t%x?RIjUobC>z{2pS$gMR_P2VLKO6=Ok9bRt-d-#02r2_TUHx3v IIVCg!0Bv#o8UO$Q diff --git a/MyTracks/res/drawable-xhdpi/menu_send_google.png b/MyTracks/res/drawable-xhdpi/menu_export.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/menu_send_google.png rename to MyTracks/res/drawable-xhdpi/menu_export.png diff --git a/MyTracks/res/drawable-xhdpi/menu_save.png b/MyTracks/res/drawable-xhdpi/menu_save.png deleted file mode 100644 index 272060253d0f904061c87ad0bea14d2ad5387abd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1610 zcmaJ#&NKrBi~77|0UFL1c?X7@Yhz4yD`hP2e# z5n-`m0DuT}vO-JklE4=dO#QzyFX^DRNu)B1OegY5m)?N`sgcOTA+=RsfNOER(X-?% zJ_`WGRI@IN%+kyi8VD;#AHZA<`lX`@Sv`cItQK+7#f6-77_d+ zsVq$zBqtm=#OI)F1Db$A2|NzQLj^nm3yMcE6v5&VG?9&=LVltU#h{@DQ_&p8e4$pM z8j3~TM6ih@?Lq``xm+9fLOcbIP!S0(Tl5W;h^);y)F!H7h+A(*Fb*0hX&9){{6Exc9YH%uE&gA=uM~Fb zJa!z>;!dK-VW0+=KP3>#E|fcPJxMrp1W`EL#WWK^5>69ghveye4hCuT2D2^jGRV+q zgle0U)Y}ZWS|Nfd4UXAt6souiZUQe}&X=Jo3{zqP9wt!oWOAvBk0tVC*f3W?7>ca8 zjU47016&@Li}Fz3sN8@Vtad800(Y2~;zpH&utI}H3(ceFA{|w4h--XRE-&hkjmkx+ zWRSpUUmErB6Xl=4am2XPWyJcpjqgLZ z!!WbxQfbiSnJ1=ghSxHK8f7y|EkD4Uf4r7idtrH4D3irvO7kRWNJ56RNs^p={lMAw z?!Q0ko6y{{aLciZ@`?se)U(?1mY#F}JUZs#5{Vfp%C{D<0CNS126PDs0W^E$uC+F) zwYr;5f|51bIVDHK+Sdp#F0u_UyT1$Wi#fuGvskx#qtXuVYv03`&ht)q-oBzkaxnYK z@eHJ|vHnTu)a(V?zSu->koeq`q~Ma(m#S)R;~Q>!$PR}1!?34IgS!Lfq{=!dl zH$-~B?72B<=86072iFFPgts0Sx-L(e2Fxofu5k{2T(mq`QnBmy#nwxYy7sbe#jfFp zDDTpG-xa5?-+CZ6_tUf+{l|B=2y#tbi%gb4xM4_PxVxXukanN|I;${wQ%wEWe0utC)b_LKSTGgYtkiO z`J?7MsF5R|Z|#km`#baD#NsY4NGZ)^(Y_7Oc_?B=R%I^FX$AZJPfoc&-Sq4-76h1* z+Ah$xgU3!?W$_n$Mw=^*V(&c>ah2w;Df}%4%y2&K7csw=m2TU9av{UJ@7ZjhBp2+5 zmV6++dYITWBZAg+=M0!`Zd&AxYXz!bUb0Vg&C_wYAZ5&r Tv6Z~~M}S&tWvZe^mb>a-%$HcT diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml index db98bfd8b..6af3ec1d7 100644 --- a/MyTracks/res/menu/track_detail.xml +++ b/MyTracks/res/menu/track_detail.xml @@ -42,54 +42,48 @@ limitations under the License. android:title="@string/menu_markers"/> - - + android:title="@string/menu_export"/> \ No newline at end of file diff --git a/MyTracks/res/menu/track_list.xml b/MyTracks/res/menu/track_list.xml index 09d53d3d2..802280907 100644 --- a/MyTracks/res/menu/track_list.xml +++ b/MyTracks/res/menu/track_list.xml @@ -32,9 +32,9 @@ limitations under the License. android:title="@string/menu_import_all"> + android:icon="@drawable/menu_export" + android:id="@+id/track_list_export_all" + android:title="@string/menu_export_all"> Edit + + Export + + + Export all + Satellite with streets - - Save - - - Save all - Search - - Send to Google - Saving to %1$s… - - Save as %1$s - Save to external storage diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java index 3a48a7c77..7d46c69d1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -26,13 +26,9 @@ import com.google.android.apps.mytracks.fragments.ChooseUploadServiceDialogFragm import com.google.android.apps.mytracks.fragments.ChooseUploadServiceDialogFragment.ChooseUploadServiceCaller; import com.google.android.apps.mytracks.fragments.DeleteTrackDialogFragment; import com.google.android.apps.mytracks.fragments.DeleteTrackDialogFragment.DeleteTrackCaller; -import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment; -import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment.FileTypeCaller; import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment; import com.google.android.apps.mytracks.fragments.MyTracksMapFragment; import com.google.android.apps.mytracks.fragments.StatsFragment; -import com.google.android.apps.mytracks.io.file.SaveActivity; -import com.google.android.apps.mytracks.io.file.TrackFileFormat; import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest; import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection; import com.google.android.apps.mytracks.settings.SettingsActivity; @@ -49,7 +45,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; -import android.os.Parcelable; import android.support.v4.app.TaskStackBuilder; import android.support.v4.view.ViewPager; import android.view.Menu; @@ -60,8 +55,6 @@ import android.view.View.OnClickListener; import android.widget.TabHost; import android.widget.TabHost.TabSpec; -import java.util.Locale; - /** * An activity to show the track detail. * @@ -69,7 +62,7 @@ import java.util.Locale; * @author Rodrigo Damazio */ public class TrackDetailActivity extends AbstractSendToGoogleActivity - implements ChooseUploadServiceCaller, DeleteTrackCaller, FileTypeCaller { + implements ChooseUploadServiceCaller, DeleteTrackCaller { public static final String EXTRA_TRACK_ID = "track_id"; public static final String EXTRA_MARKER_ID = "marker_id"; @@ -97,8 +90,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity private MenuItem insertMarkerMenuItem; private MenuItem playMenuItem; private MenuItem shareMenuItem; - private MenuItem sendGoogleMenuItem; - private MenuItem saveMenuItem; + private MenuItem exportMenuItem; private MenuItem voiceFrequencyMenuItem; private MenuItem splitFrequencyMenuItem; private MenuItem feedbackMenuItem; @@ -309,8 +301,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker); playMenuItem = menu.findItem(R.id.track_detail_play); - sendGoogleMenuItem = menu.findItem(R.id.track_detail_send_google); - saveMenuItem = menu.findItem(R.id.track_detail_save); + exportMenuItem = menu.findItem(R.id.track_detail_export); voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency); splitFrequencyMenuItem = menu.findItem(R.id.track_detail_split_frequency); feedbackMenuItem = menu.findItem(R.id.track_detail_split_frequency); @@ -360,16 +351,11 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity PreferencesUtils.SPLIT_FREQUENCY_DEFAULT, R.string.menu_split_frequency) .show(getSupportFragmentManager(), FrequencyDialogFragment.FREQUENCY_DIALOG_TAG); return true; - case R.id.track_detail_send_google: + case R.id.track_detail_export: AnalyticsUtils.sendPageViews(this, "/action/send_google"); new ChooseUploadServiceDialogFragment().show(getSupportFragmentManager(), ChooseUploadServiceDialogFragment.CHOOSE_UPLOAD_SERVICE_DIALOG_TAG); return true; - case R.id.track_detail_save: - FileTypeDialogFragment.newInstance(R.id.track_detail_save, R.string.save_selection_title, - R.string.save_selection_option, 4) - .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG); - return true; case R.id.track_detail_edit: intent = IntentUtils.newIntent(this, TrackEditActivity.class) .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId); @@ -446,21 +432,6 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity }); } - @Override - public void onFileTypeDone(int menuId, TrackFileFormat trackFileFormat) { - switch (menuId) { - case R.id.track_detail_save: - AnalyticsUtils.sendPageViews( - this, "/action/save_" + trackFileFormat.name().toLowerCase(Locale.US)); - Intent intent = IntentUtils.newIntent(this, SaveActivity.class) - .putExtra(SaveActivity.EXTRA_TRACK_IDS, new long[] {trackId}) - .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat); - startActivity(intent); - break; - default: - } - } - /** * Gets the {@link TrackDataHub}. */ @@ -531,11 +502,8 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity if (shareMenuItem != null && shareMenuItem.isEnabled()) { shareMenuItem.setVisible(!isRecording); } - if (sendGoogleMenuItem != null) { - sendGoogleMenuItem.setVisible(!isRecording); - } - if (saveMenuItem != null) { - saveMenuItem.setVisible(!isRecording); + if (exportMenuItem != null) { + exportMenuItem.setVisible(!isRecording); } if (voiceFrequencyMenuItem != null) { voiceFrequencyMenuItem.setVisible(isRecording); diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java index 31eefd770..41ee179b6 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java @@ -282,7 +282,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity private MenuItem searchMenuItem; private MenuItem startGpsMenuItem; private MenuItem importAllMenuItem; - private MenuItem saveAllMenuItem; + private MenuItem exportAllMenuItem; private MenuItem deleteAllMenuItem; private MenuItem syncNowMenuItem; private MenuItem feedbackMenuItem; @@ -457,7 +457,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity searchMenuItem = menu.findItem(R.id.track_list_search); startGpsMenuItem = menu.findItem(R.id.track_list_start_gps); importAllMenuItem = menu.findItem(R.id.track_list_import_all); - saveAllMenuItem = menu.findItem(R.id.track_list_save_all); + exportAllMenuItem = menu.findItem(R.id.track_list_export_all); deleteAllMenuItem = menu.findItem(R.id.track_list_delete_all); syncNowMenuItem = menu.findItem(R.id.track_list_sync_now); feedbackMenuItem = menu.findItem(R.id.track_list_feedback); @@ -525,9 +525,9 @@ public class TrackListActivity extends AbstractSendToGoogleActivity R.string.import_selection_title, R.string.import_selection_option, 2) .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG); return true; - case R.id.track_list_save_all: - FileTypeDialogFragment.newInstance(R.id.track_list_save_all, R.string.save_selection_title, - R.string.save_all_selection_option, 4) + case R.id.track_list_export_all: + FileTypeDialogFragment.newInstance(R.id.track_list_export_all, + R.string.save_selection_title, R.string.save_all_selection_option, 4) .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG); return true; case R.id.track_list_delete_all: @@ -607,7 +607,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity public void onFileTypeDone(int menuId, TrackFileFormat trackFileFormat) { Intent intent; switch (menuId) { - case R.id.track_list_save_all: + case R.id.track_list_export_all: AnalyticsUtils.sendPageViews( this, "/action/save_all_" + trackFileFormat.name().toLowerCase(Locale.US)); intent = IntentUtils.newIntent(this, SaveActivity.class) @@ -717,8 +717,8 @@ public class TrackListActivity extends AbstractSendToGoogleActivity if (importAllMenuItem != null) { importAllMenuItem.setVisible(!isRecording); } - if (saveAllMenuItem != null) { - saveAllMenuItem.setVisible(!isRecording); + if (exportAllMenuItem != null) { + exportAllMenuItem.setVisible(!isRecording); } if (deleteAllMenuItem != null) { deleteAllMenuItem.setVisible(!isRecording); diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java index 9ab8fb1e4..27b7be4cc 100644 --- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java +++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java @@ -23,6 +23,7 @@ import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.maps.mytracks.R; import com.jayway.android.robotium.solo.Solo; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.Instrumentation; import android.content.Context; @@ -545,7 +546,7 @@ public class EndToEndTestUtils { public static void saveTrackToSdCard(String trackKind) { deleteExportedFiles(trackKind); instrumentation.waitForIdleSync(); - findMenuItem(activityMytracks.getString(R.string.menu_save), true); + findMenuItem(activityMytracks.getString(R.string.menu_export), true); instrumentation.waitForIdleSync(); SOLO.clickOnText(trackKind.toUpperCase()); EndToEndTestUtils @@ -611,6 +612,7 @@ public class EndToEndTestUtils { * * @return false means can not check failed. */ + @SuppressLint("NewApi") private static boolean setHasActionBar() { try { return activityMytracks.getActionBar() == null ? false : true; diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java index 8830c6242..ecdbf64e4 100644 --- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java +++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java @@ -54,7 +54,7 @@ public class CreateTrackTest extends ActivityInstrumentationTestCase2 checkBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();