From 56e272c5d488701b41b477f3a8b55691acab7a16 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Mon, 3 Jun 2013 15:54:12 -0700 Subject: [PATCH] Remove Google Drive item from Send to Google dialog. --- .../res/drawable-hdpi/google_drive_icon.png | Bin 2808 -> 0 bytes .../res/drawable-ldpi/google_drive_icon.png | Bin 1205 -> 0 bytes .../res/drawable-mdpi/google_drive_icon.png | Bin 1870 -> 0 bytes MyTracks/res/layout/choose_upload_service.xml | 10 ----- MyTracks/res/values/keys.xml | 1 - .../apps/mytracks/TrackDetailActivity.java | 13 ++---- .../ChooseUploadServiceDialogFragment.java | 37 ++---------------- .../apps/mytracks/util/PreferencesUtils.java | 1 - 8 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 MyTracks/res/drawable-hdpi/google_drive_icon.png delete mode 100644 MyTracks/res/drawable-ldpi/google_drive_icon.png delete mode 100644 MyTracks/res/drawable-mdpi/google_drive_icon.png diff --git a/MyTracks/res/drawable-hdpi/google_drive_icon.png b/MyTracks/res/drawable-hdpi/google_drive_icon.png deleted file mode 100644 index 0f5f2449f8eb61a25533e342ebdf3e0459a13b62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2808 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 KMNUMnLSTZyvy?Fa diff --git a/MyTracks/res/drawable-ldpi/google_drive_icon.png b/MyTracks/res/drawable-ldpi/google_drive_icon.png deleted file mode 100644 index 4e82793e04140c54190aaf3409d7efd18cd10603..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1205 zcmV;m1WNmfP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*Y} z5ivDKv-w8=00cEjL_t(Y$JLf!sAg3e#(&Sd_Wu5zIiurg94DCy6J~HQA#WP6u&FMB zF2tM2NyLi=^+FW&LW)3WB#N*c=psxlrV_mfBZ-Q^55T{96ulrjgzd@V?Eha&cF7H3lc_I+7G zPn;h6$=8As0tqP~$~wgJjK13)-5>86FnHj)FG%`yDdFW9=)o7o%IaL6^;rsvB1N$j z`!aR=djgCex_%;YuL9JB+J%;%uZ(!&m@xrbm#Fkpp?=lf)1#l-{a*nlze(tWlrSM; zSjb_+p}!Q)oXrjW(L0$S8R-Jdq5lXNKYZXyNuN_l3P} zk6yAO`lqj+{%QZUn*yx3S-}UQsCP{WjaoEm-43MtkB?5yrnw9fVD~A%V+&ZaeaqS( zufE`2fbkE%_}LKGC^UBm5JEjfY74VczSfS*m)ysdoun(y3RpeTpESPa9Kh%Y*KYxC zKrBgNNm>t%uqG`UlxG)OJ)p~f`7`k2aw5_=v5jpYjU6~|d;1SpU9tfX{y6CK^bIP9 z=iTald)QiwqpzO5=ND%IPMuym^va31&%AMJRd1c0Sxy=m&9iX&ax!lQD5HlCEP##( z?UbcpEfgOCDdH#Ybi{V@w;+ zHe%}}{J!&xwoc+H4ZnZgNl8nDyz%k9_Gs3!`0N$A@baZ=w5lbf#a$nz3?|0Jj`G*x zBFm+#rdH#uWUXMM5Ur-KHa1TKpXudJY=I#pnw9ey9orR@Iu5mLx%dj&!Gw@7aH8(v z_1sOZNmmnRQoD}Y)xPk=SHkv?QoG$5DJ=7XhJlC z63_?&6T%@Q@>roe60SZDeA#Ji_s+u%UfsdqQU}IKW7M{6`n2Z>2-$NOm2bpYCo_`8@?w!^9T6$9On->mW z>;RY@{K+v{hcR6?YufVs9-3|&qYE#ijJDxSY;c-PlhxFkWHo)}8%KtKlyv0z``^Fv zuV>MtF5T~kCwDSg-s90ldx^m!&c0xoCT(gawN|>CJ;aHf7<=B)zqb9@yUwEN!5^=r zRu7;5;wMf`madeVF`1Rj-W{2Jz*>_olde{}%pTZhCfjEWN1nTH$6NoizlwhVokRe# Txu;-A00000NkvXXu0mjf7tBNW diff --git a/MyTracks/res/drawable-mdpi/google_drive_icon.png b/MyTracks/res/drawable-mdpi/google_drive_icon.png deleted file mode 100644 index 1ce335594cac1ebc34df1076fed214ce051ce554..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1870 zcmV-U2eJ5xP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*Y} z5iJvQ$sy+e00z!UL_t(o!|j$`tQ}<)hM%>*nc3%@p3{~VDNq8frVv7*73HU`XhDf2 z8cozFr-h&-DiBPn+?iN4k(d|);V0pz(%JwKj6aDHlU}siYD=Yn0;#rwfH5>6&|1K9 zy7!*-dhvbxw8*La#0xK+eKE6V=9~3?YrXHg7W~g2H;%ufWfR-ZdrR-xTYBrJFTMM^ znY;dS<-CK37Mg)MX5};a0?VJgacJppR{d814Bvh+{p6db?|tR`KP-M;M-7>o8D^dr zn}e0GcIb10#luUsJo;we_ai;1@5rfd%|3`&{!-o1Hy(DI)}id&z!TRMR?^P_buu1iT6~rI6mOO005J*B!x-3wRv*>RlSp+p?Uwt zH!s1^x=Zo{_sh*~uDRhU2l1muXam0Xu+z5Sp4o4nIpE3hRNGI7~m;Qlc)TWHC|;T!R+b(=K;2|Ix6n~x_|jR|EVcmtsd8i6Eknb>~*SasNjZD%!BQ9&s z{WTMhetK#S46R?e8tim8)9cc2#bQlZr-s_WeHY)|u(2ClgIV7QvH*k#LV$!MlY|)( z-0<4AJkx1~~pgfPdN3X+>O@gacDnH#o6#Ba0s zTD5Jfh!!G{A{PKjA&@H6zYXBEtxGb1;dLu>?Pb>q=2!-$fwyPh7nZXr64;E9uXk5( z*jul@C>vKNeQMwS33|PtuCe6G!6g(zAtRSTpwAxIy7Y|UWe*%u!O+?j=is*8vaU0k zQvy?#RmpC_u*d3VaewRX7rHlWX7APyGi%vKesSA5Uma=M>xUcHakD!%Yb?>!MskQY zPy~_&S=l-Afd>}m4BWY*681d?obD_KGEim?+GQxDH9?INosnNc}ZjwKV7XGyt(CnK3~lNo_oyY{JD-u1k94^BKS z>BkDW0*EXY0%!vXrag8V-giVFykgqiMWlM9R4TXRWRANR*=F}VyxABWZf-B_zWIc2 zWh1)!XS8j51)`UY3sdBakVyZSMzd!QVLi+$Mo(Nqs!DJSHzS#o+)0-3GOi7t4*+3i zZdQf`jRTzWm1psK%{XzzkGf!AL^6dmkf6NJ^c`pAw0EX6Ht)RBUj!-vN-MU)8!O_m zH;y|hcYZIi8DRI#bMq_BniaHCN@%C>lR+j6jXrg(xHCz~ z@sy|FLA^5oD+&;j5fOwm89drhfR*6){qcr57awsV>VNs(9f)<|eH(uEBz4jPhK@M{ zMLTJw2tosn1g%6w&~J0lh|HZRJQ5fYlJrmDI{>GydT#28s9Cduel>A?ePC?&+$~p* zHgitQL4j0NIn{;fZic(#4u-=dH4X)DBYVFjqHTY^^ZH{x`G)cT-&qo$|LL9?SKoe4 zGyA0BYz@j2@1#VsSE$^JnCzBi9u`s7F&I!Jm-GbxKc+bT1*6VogpDE;6951J07*qo IM6N<$g5 - - - - minRequiredAccuracy pickExistingMap reportSpeed - sendToDrive sendToFusionTables sendToMaps sendToSpreadsheets diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java index 3954f72aa..3a48a7c77 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -362,10 +362,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity return true; case R.id.track_detail_send_google: AnalyticsUtils.sendPageViews(this, "/action/send_google"); - Track track = myTracksProviderUtils.getTrack(trackId); - boolean sharedWithMe = track != null ? track.isSharedWithMe() : true; - ChooseUploadServiceDialogFragment.newInstance(sharedWithMe).show( - getSupportFragmentManager(), + new ChooseUploadServiceDialogFragment().show(getSupportFragmentManager(), ChooseUploadServiceDialogFragment.CHOOSE_UPLOAD_SERVICE_DIALOG_TAG); return true; case R.id.track_detail_save: @@ -415,17 +412,13 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity } @Override - public void onChooseUploadServiceDone(boolean sendDrive, boolean sendMaps, - boolean sendFusionTables, boolean sendSpreadsheets, boolean mapsExistingMap) { + public void onChooseUploadServiceDone(boolean sendMaps, boolean sendFusionTables, + boolean sendSpreadsheets, boolean mapsExistingMap) { SendRequest sendRequest = new SendRequest(trackId); - sendRequest.setSendDrive(sendDrive); sendRequest.setSendMaps(sendMaps); sendRequest.setSendFusionTables(sendFusionTables); sendRequest.setSendSpreadsheets(sendSpreadsheets); sendRequest.setMapsExistingMap(mapsExistingMap); - if (sendDrive) { - AnalyticsUtils.sendPageViews(this, "/send/drive"); - } if (sendMaps) { AnalyticsUtils.sendPageViews(this, "/send/maps"); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java index b23bad977..52404d229 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java @@ -51,28 +51,15 @@ public class ChooseUploadServiceDialogFragment extends DialogFragment { /** * Called when choose upload service is done. */ - public void onChooseUploadServiceDone(boolean sendDrive, boolean sendMaps, - boolean sendFusionTables, boolean sendSpreadsheets, boolean mapsExistingMap); + public void onChooseUploadServiceDone(boolean sendMaps, boolean sendFusionTables, + boolean sendSpreadsheets, boolean mapsExistingMap); } public static final String CHOOSE_UPLOAD_SERVICE_DIALOG_TAG = "chooseUploadService"; - private static final String KEY_HIDE_DRIVE = "hideDrive"; - - public static ChooseUploadServiceDialogFragment newInstance(boolean hideDrive) { - Bundle bundle = new Bundle(); - bundle.putBoolean(KEY_HIDE_DRIVE, hideDrive); - - ChooseUploadServiceDialogFragment chooseUploadServiceDialogFragment = new ChooseUploadServiceDialogFragment(); - chooseUploadServiceDialogFragment.setArguments(bundle); - return chooseUploadServiceDialogFragment; - } - private ChooseUploadServiceCaller caller; private FragmentActivity fragmentActivity; - private boolean hideDrive; - private CheckBox driveCheckBox; private CheckBox mapsCheckBox; private CheckBox fusionTablesCheckBox; private CheckBox spreadsheetsCheckBox; @@ -94,20 +81,13 @@ public class ChooseUploadServiceDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { fragmentActivity = getActivity(); - hideDrive = getArguments().getBoolean(KEY_HIDE_DRIVE); View view = fragmentActivity.getLayoutInflater().inflate(R.layout.choose_upload_service, null); - view.findViewById(R.id.choose_upload_service_drive_options) - .setVisibility(hideDrive ? View.GONE : View.VISIBLE); - - driveCheckBox = (CheckBox) view.findViewById(R.id.choose_upload_service_drive); mapsCheckBox = (CheckBox) view.findViewById(R.id.choose_upload_service_maps); fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.choose_upload_service_fusion_tables); spreadsheetsCheckBox = (CheckBox) view.findViewById(R.id.choose_upload_service_spreadsheets); - driveCheckBox.setChecked(PreferencesUtils.getBoolean( - fragmentActivity, R.string.send_to_drive_key, PreferencesUtils.SEND_TO_DRIVE_DEFAULT)); mapsCheckBox.setChecked(PreferencesUtils.getBoolean( fragmentActivity, R.string.send_to_maps_key, PreferencesUtils.SEND_TO_MAPS_DEFAULT)); fusionTablesCheckBox.setChecked(PreferencesUtils.getBoolean( @@ -156,8 +136,6 @@ public class ChooseUploadServiceDialogFragment extends DialogFragment { .setPositiveButton(R.string.send_google_send_now, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - PreferencesUtils.setBoolean( - fragmentActivity, R.string.send_to_drive_key, driveCheckBox.isChecked()); PreferencesUtils.setBoolean( fragmentActivity, R.string.pick_existing_map_key, existingMapRadioButton.isChecked()); PreferencesUtils.setBoolean( @@ -166,9 +144,9 @@ public class ChooseUploadServiceDialogFragment extends DialogFragment { fragmentActivity, R.string.send_to_fusion_tables_key, fusionTablesCheckBox.isChecked()); PreferencesUtils.setBoolean( fragmentActivity, R.string.send_to_spreadsheets_key, spreadsheetsCheckBox.isChecked()); - if (sendDrive() || mapsCheckBox.isChecked() || fusionTablesCheckBox.isChecked() + if (mapsCheckBox.isChecked() || fusionTablesCheckBox.isChecked() || spreadsheetsCheckBox.isChecked()) { - caller.onChooseUploadServiceDone(sendDrive(), mapsCheckBox.isChecked(), + caller.onChooseUploadServiceDone(mapsCheckBox.isChecked(), fusionTablesCheckBox.isChecked(), spreadsheetsCheckBox.isChecked(), existingMapRadioButton.isChecked()); } else { @@ -185,11 +163,4 @@ public class ChooseUploadServiceDialogFragment extends DialogFragment { private void updateMapsOption() { mapsOptionTableRow.setVisibility(mapsCheckBox.isChecked() ? View.VISIBLE : View.GONE); } - - /** - * True to send to Google Drive. - */ - private boolean sendDrive() { - return !hideDrive && driveCheckBox.isChecked(); - } } 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 b110d8286..20f90c467 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java @@ -92,7 +92,6 @@ public class PreferencesUtils { public static final boolean REPORT_SPEED_DEFAULT = true; public static final long SELECTED_TRACK_ID_DEFAULT = -1L; - public static final boolean SEND_TO_DRIVE_DEFAULT = false; public static final boolean SEND_TO_FUSION_TABLES_DEFAULT = false; public static final boolean SEND_TO_MAPS_DEFAULT = false; public static final boolean SEND_TO_SPREADSHEETS_DEFAULT = false;