From f89c6696b345289a76237e1e4393c2cc8eb9a35a Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 4 Jun 2013 15:32:19 -0700 Subject: [PATCH] Combine save and send to google into export. --- .../google_fusion_tables_icon.png | Bin 892 -> 0 bytes .../res/drawable-hdpi/google_maps_icon.png | Bin 1025 -> 0 bytes .../google_spreadsheets_icon.png | Bin 2294 -> 0 bytes .../google_fusion_tables_icon.png | Bin 631 -> 0 bytes .../res/drawable-ldpi/google_maps_icon.png | Bin 859 -> 0 bytes .../google_spreadsheets_icon.png | Bin 1083 -> 0 bytes .../google_fusion_tables_icon.png | Bin 681 -> 0 bytes .../res/drawable-mdpi/google_maps_icon.png | Bin 892 -> 0 bytes .../google_spreadsheets_icon.png | Bin 1422 -> 0 bytes MyTracks/res/layout/choose_upload_service.xml | 69 ----- MyTracks/res/layout/export.xml | 81 ++++++ MyTracks/res/layout/upload_result.xml | 16 +- MyTracks/res/values/do_not_translate.xml | 8 +- MyTracks/res/values/keys.xml | 10 +- MyTracks/res/values/strings.xml | 160 ++++-------- MyTracks/res/values/styles.xml | 19 +- MyTracks/res/xml/google_settings.xml | 10 - .../AbstractSendToGoogleActivity.java | 8 +- .../apps/mytracks/TrackDetailActivity.java | 60 +++-- .../ChooseUploadServiceDialogFragment.java | 166 ------------ .../fragments/ExportDialogFragment.java | 246 ++++++++++++++++++ .../mytracks/io/drive/SendDriveActivity.java | 2 +- .../SendFusionTablesActivity.java | 2 +- .../SendFusionTablesAsyncTask.java | 4 +- .../mytracks/io/maps/SendMapsActivity.java | 2 +- .../mytracks/io/maps/SendMapsAsyncTask.java | 5 +- .../io/sendtogoogle/UploadResultActivity.java | 5 +- .../SendSpreadsheetsActivity.java | 2 +- .../settings/GoogleSettingsActivity.java | 11 +- .../apps/mytracks/util/PreferencesUtils.java | 14 +- .../endtoendtest/common/CreateTrackTest.java | 38 --- .../endtoendtest/common/SendToGoogleTest.java | 4 +- 32 files changed, 467 insertions(+), 475 deletions(-) delete mode 100755 MyTracks/res/drawable-hdpi/google_fusion_tables_icon.png delete mode 100644 MyTracks/res/drawable-hdpi/google_maps_icon.png delete mode 100644 MyTracks/res/drawable-hdpi/google_spreadsheets_icon.png delete mode 100644 MyTracks/res/drawable-ldpi/google_fusion_tables_icon.png delete mode 100644 MyTracks/res/drawable-ldpi/google_maps_icon.png delete mode 100644 MyTracks/res/drawable-ldpi/google_spreadsheets_icon.png delete mode 100644 MyTracks/res/drawable-mdpi/google_fusion_tables_icon.png delete mode 100644 MyTracks/res/drawable-mdpi/google_maps_icon.png delete mode 100644 MyTracks/res/drawable-mdpi/google_spreadsheets_icon.png delete mode 100644 MyTracks/res/layout/choose_upload_service.xml create mode 100644 MyTracks/res/layout/export.xml delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java diff --git a/MyTracks/res/drawable-hdpi/google_fusion_tables_icon.png b/MyTracks/res/drawable-hdpi/google_fusion_tables_icon.png deleted file mode 100755 index e049f8bcbcbdff96335ed5b8bf771641307d65bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 892 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 QEC2ui07*qoM6N<$g1Hnr+W-In diff --git a/MyTracks/res/drawable-ldpi/google_fusion_tables_icon.png b/MyTracks/res/drawable-ldpi/google_fusion_tables_icon.png deleted file mode 100644 index 8ff202697b04ea70712f0db5c55ef5486a8c3f03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP)Px#y--Y4MdaewOvQUo9n<#OiGpa}hl-+f~Ywzvh7?#)K z-_V7}eFKlwi=e39+|cUh+St~}4yXCM+qDUt=^mQd;^)00DGT zPE!Ct=GbNc0004EOGiWihy@);00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-pl z4*?Akpx3900003dNklShd^Bm4dzYj;)R zmTb%ZFYnj8Ynl@B@4Q2HyB{EqW6SdYfbMa*{D4$dWvVnP9eKqVhB2Sdi=r5Yq3?TL zXUFd_+<<+7si$C!jpKNP9iHdew)y;q2{ad1`zJ}d%ERMNFPlviIc%ojgs@)QFb2VK zwgA=ym0_MuPoz-a3*-U=V~z R(mMbE002ovPDHLkV1iO?Bn$um diff --git a/MyTracks/res/drawable-ldpi/google_maps_icon.png b/MyTracks/res/drawable-ldpi/google_maps_icon.png deleted file mode 100644 index 21bfabba8587f0a9b4c2b0e2e6eaecd2e05dccd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 859 zcmV-h1ElPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyh^ z5F;W9LJO64CSh7hX&SY*;KH5Y zN^qmljsJj11sB=r!oB(@2n7o@7EMf}8SF?hlTd3A6e%KZs#6n_%)6h9`(6@jGBaY% zeV6yR-1D9DednAfdf3W^I+?Pn#1*6$g@!{2fYuP#g2I%utTpn<7v2v;dmVoF+-b59 z)V1FfdPhN-BtTXWLd7G5rZQKqY^m#!>o@;}6&^ge{cN2RGflQ)d>NPmXMk~$kas0z zFn()G-PcC0-{glE&JD(3WwL%aRJbn$5~0X8lHQe&;%FCy@gv8kzv}d501)K2cX9+9 z?r!GH-d|^?^A~qFx?oc*r)z$1PprKwx5iq`u>o67 zF)jkEUOL-9K#V@LlbhL!=C^K65XjKUbAH*(kxg_=JH{icm&PAIeq-SuSlK?URl!a& zTL_a0>{RIr@MsXxaaXyCpx+0SNZ)T$#|%qcJn}F((8Wv~eu&2^O2tWA*gqe?(b#wp zYEK5yd?@rhMaB};hB8hM9fAP4MIIwjDzg{x!N7wCuzY@OQDPKqsTi!%MWv%k@Sjf1 zG@l%(i&oB$m9kz=1XMJ-3qs!hHdbl|zXEXQ!kNJsEKiOiD_DLX^M)j+q@4y#?3U&u z;IcyKJ~i|0;1U6}Cu>J#H4#sg0-^1Hg>CKu^^t8aje z0nK*PuwD#CYH?S>fjihX|&7FuR%lU lZ24d%D(dj=V2!0bbDPbjB@zGt002ovPDHLkV1k(fherSa diff --git a/MyTracks/res/drawable-ldpi/google_spreadsheets_icon.png b/MyTracks/res/drawable-ldpi/google_spreadsheets_icon.png deleted file mode 100644 index 18cc61bd381bd91da2b16ecebe3ad6da8c0b0864..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1083 zcmV-B1jPG^P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*b< z05}E|A~zxc00X;8L_t(Y$9F_uTPby(3LAMu})x7WN=PBo$E@q=gw_ zQuJi@l#ulhQEx#~)Qco!kP!4zfg~7VG|^);55AfB5ags0q|T%b^Y6~tUl04-bI)}y zZtme6&RKhXYkl8ZYhO{W=J6MHNPG*7N&*`pRxV=+8@fd|zO?1>V;^ik@aBe*HQgb` zgz7;$DHs(p01_6-S#?iWvQPUudHdk;bEiLh_srMXO#zTQAR~bQksM=;Fy(VEDFu*Z zW81F)6E_DSK#&qILJ9;0vJl9E$btwVy+Z+GD6K6=%TK&>=9`JP&wSMy3g8;us#7o3 zt};1+BtXtWP?lwCge*3)@Z?CIfBCmP(%ass{GddHN`6v=DbfLn(^n)Eqw3d*8V5Q4Tye01yOLs2t-km`N?uh>^`mmUH6l&thsCx=}cq=t#)+tjNHXb{TVv zbA6y5FRoeDpT}B|-v)oo&}_8i7^N6lS^*#-iMiR!oY?suoxD{MG8Y$VszF16p-bZ0 z_3P|A@)~*j)~b{T04Q~2xy$zPd-&ws_slIXQMlmMyLT{o^>@zATq>Kdr$od+JIi_f z{@t*tgQhd$aKFBokA=rYMr0W$F>~)g0Qo8`?Qx z^cH+!dRPX%>Jhg2;*ocXig4yu=zcCJR~F@v1;qHd=2=V1mTXpAOUQ&O@=lce@UA^!yL}_~&E- zaHTLf(#YFP?K{?+w*$g72B%Cv?Z?*L%YWTP7K$Z0ja6)2yPlbKvxJJIWEe4>#;TGc zmlS(g2Ict`8l0WE$dL#4rvWH&dEpu_Z+esin|JgB89d`S`|m}_nq|2T1HeR^c4wSj z6YpbrMRiqNqSRnF%%|3xaqKuSBpZX(ZtO@aYbMbv=Y1Pj+>?SROIDb|F z?7>{YmTIY29b3|XlXLYNtqefvAA&GfF?)M%{|7D*#q|qx>o5QS002ovPDHLkV1hAz B??V6p diff --git a/MyTracks/res/drawable-mdpi/google_fusion_tables_icon.png b/MyTracks/res/drawable-mdpi/google_fusion_tables_icon.png deleted file mode 100644 index e1eda796bdf2d779c7d53bcd8eb78ad615a09d3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 681 zcmV;a0#^NrP)#%-C~=`Psz?Qt-F3lh@9p6jme=Cn(1pi+1CP{;ps3#5 z(CX*f*w)Anr}?|vwF#W*9-7(W=hd0FzOvQcQgw)tvbf~p*U8|%E|F6mqCy_9|9_O5 zTCigng1w&9qSe#J8g!=7&%!~g-$$Zcuf4kV_3S56ZP3oaT8yX*fI`^h+QH)R0E*4R z!?|*=d&kz&1)4i(yjO$D>eSK1Mzroee5G%-pRnAjbTSMw00001bW%=J06^y0W&i*I zmq|oHRCr#k(B+QZFc5~}n8M6-n3;CB2={+i9gm&vk*cav)%WlB#Ij@jV_&iT{_!VJ zR8{4=Zv0=sX;PNu57}B~skXZBCnNH_Pcjp79A`G0eT2>!W7DaDtKOdh?qYh=z8YVHcjiTw4&Va3IGCu zIsk!hInXlOyk%Ws58 z()c&Pl55sg(8`vet^-*OAX6X-Q~nO diff --git a/MyTracks/res/drawable-mdpi/google_maps_icon.png b/MyTracks/res/drawable-mdpi/google_maps_icon.png deleted file mode 100644 index 0449dc893d4c98bfe2de6b2088f7fa3a276604e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 892 zcmV-?1B3jDP)oe1fe^rN7aR)5!jqLN5Cx4K!F$p1RgL0 zT)hL7NQvCQ1U_UYx!m_na1AIs%`kvs;FjF6#b+gJ0t8NS!xlMDc%aNsr&9$*K|Qff z-c!dPuhzTaL?F1#(QgUBwqWY!w?9o`d>q9?8mf1y>0itT0mOpw@s>Lu?vQcEG|TV5 zoA9u)4L@2fG1L9g2;4~Qg+sBZmY*q}D15-(ZV0^;7?-mbQ*uc`_2)J;nk^*;iuQy0 zFYh~{f;4(h1_1;Tka0tejSAokDc~|f1=wgd;VbpKz%m5VKFv;LEJGk+7SX~Cp?u83jO-)TLE6yFP&ZEN3}W5Z^h}=^;Gc5Is^rj3ir@W zN;)S%(Z-h@0T3zLmvOOdS3%trP1I@bda%dW)*WPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*b< z05>R4Y$hTA00j<7L_t(o!ZG>@&?e0taTeY^Io z*>-uZ_gw3x9W`tdhRh65`mD_AQ>w)91eDmJe zybLfb3Wd%Pt~c!1zORl9%$0-~4zno1ITVFj2QHL|l_*4^&T!7*%$aiz=SYv6^t+=_j$pEfVHz}zs5taKS#qY2oAQbj9Ez#q4r|c@J)R5%NZu7 zt^va1d35MpCgg%Zw4AY{SV=_-vI& zGLXsw6B1M*SFn%+p&R<3n~M2rWuw+R2hvq{HC{OLHs4NO zKr(Va&EYN2vvgoFPkwfgn$n7; znx7Qnmj9i)NBfA=#emAp8F}`sd6}JrSr@!(}{k`c2MH zUIaW-d6UCi_Oi5p5j#%2Mt>~}N_{A^l4219Ox!WNoR1%QInk_H7PJl|ij$DqqUDRk zYAFxloGScgJJk1+sFk{Uy10=&rE3cKzYbpm6#p$S! zSk%4tOL}s4JBouQeLnkARlE)y%8W*J|S>ID(0ckki9$v&<78I@JUj(c7lRQNorcjf^aT=AILtJ ccskYjA6wmF7KrLu>;M1&07*qoM6N<$g5t21x&QzG diff --git a/MyTracks/res/layout/choose_upload_service.xml b/MyTracks/res/layout/choose_upload_service.xml deleted file mode 100644 index c646b66e2..000000000 --- a/MyTracks/res/layout/choose_upload_service.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MyTracks/res/layout/export.xml b/MyTracks/res/layout/export.xml new file mode 100644 index 000000000..3a17b7437 --- /dev/null +++ b/MyTracks/res/layout/export.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MyTracks/res/layout/upload_result.xml b/MyTracks/res/layout/upload_result.xml index f43c69346..45783bb02 100644 --- a/MyTracks/res/layout/upload_result.xml +++ b/MyTracks/res/layout/upload_result.xml @@ -42,10 +42,10 @@ limitations under the License. android:orientation="vertical" android:paddingLeft="8dp" > @@ -70,10 +70,10 @@ limitations under the License. android:orientation="vertical" android:paddingLeft="8dp" > @@ -98,10 +98,10 @@ limitations under the License. android:orientation="vertical" android:paddingLeft="8dp" > @@ -126,10 +126,10 @@ limitations under the License. android:orientation="vertical" android:paddingLeft="8dp" > diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml index a13fc5305..14ad5f066 100644 --- a/MyTracks/res/values/do_not_translate.xml +++ b/MyTracks/res/values/do_not_translate.xml @@ -70,6 +70,10 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정 대표자: 염동훈\n 주소 : 서울 강남구 역삼동 737 강남파이낸스센터 22층\n 전화번호 : (02) 531-9000\n + drive.google.com + 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 @@ -79,10 +83,6 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정 groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks www.google.com/mobile/mytracks com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS - drive.google.com - google.com/fusiontables - maps.google.com - drive.google.com ANT NONE POLAR diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml index c1af86b4d..dee898dae 100644 --- a/MyTracks/res/values/keys.xml +++ b/MyTracks/res/values/keys.xml @@ -25,19 +25,17 @@ limitations under the License. chartShowPower chartShowSpeed defaultActivity - defaultMapPublic - defaultTablePublic + exportExternalStorageFormat + exportGoogleFusionTablesPublic + exportGoogleMapsPublic + exportType mapType maxRecordingDistance metricUnits minRecordingDistance minRecordingInterval minRequiredAccuracy - pickExistingMap reportSpeed - sendToFusionTables - sendToMaps - sendToSpreadsheets sensorType shareTrack splitFrequency diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 6d5fedb8d..d83b07edc 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -612,6 +612,59 @@ limitations under the License. Terms of Service + + + External storage + + + as %1$s file + + + Google Drive + + + Google Fusion Tables + + + as new private table + + + as new public table + + + Google Maps + + + as new public map + + + as new unlisted map + + + Google Spreadsheets + + + Export to… + + @@ -1299,50 +1352,11 @@ limitations under the License. translation_description="When sending to Google, the dialog title to choose a Google account."> Choose account - - Google Drive - An error has occurred. Please try again. - - Use existing map - - - Google Fusion Tables - - - (new private table) - - - (new public table) - - - Google Maps - - - Create new public map - - - Create new unlisted map - @@ -1358,38 +1372,17 @@ limitations under the License. permission."> Not able to get account permission. Make sure network is available. - - You did not select any service. The track was not sent. - Sending to %1$s… - - Send now - - - Google Spreadsheets - It may take a few minutes before new tracks appear. - - Send to… - Sync Google Drive - - New tables created in Google Fusion Tables will be private, instead of public. - - - New tables created in Google Fusion Tables will be public, instead of private. - - - New tables public - - - New maps created in Google Maps will be unlisted, instead of public. See %1$s for more info. - - - New maps created in Google Maps will be public, instead of unlisted. See %1$s for more info. - - - New maps public - Grade - + Latitude diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml index 9d6b7cc40..6d0248c02 100644 --- a/MyTracks/res/values/styles.xml +++ b/MyTracks/res/values/styles.xml @@ -32,19 +32,6 @@ limitations under the License. match_parent horizontal - - - - + +